Merge branch 'develop' of https://github.com/remap/ndn-js into develop