Changing Naming format of Content Name (ndn)
Merge branch 'nlsr-sync' of github.com:NDN-Routing/NLSR0.0 into nlsr-sync