No change
Merge branch 'master' of https://github.com/nishant-jain/Middleware-dev

Conflicts:
	ServerApplication/Src/QueryHandlerModule.pyc
	ServerApplication/Src/RegistrationModule.pyc