a
Merge branch 'master' of https://github.com/whynpc/NdnKeyManagementTool

Conflicts:
	src/organizersession.cpp