safety purpose
Merge branch 'master' of github.com:giridhara/jn-server-cc

Conflicts:
	src/JNStorage.h
	src/Journal.h
	util/Constants.h
	util/StorageInfo.h