reset
Merge branch 'master' of github.com:ndncc/NDN_DCN
fixed bugs