Changes made during query testing with Nikita
Merge branch 'master' of https://github.com/nishant-jain/Middleware-dev

Conflicts:
	ServerApplication/Src/QueryHandlerModule.py
TimeoutComment

useless.
commit try 2
Merge branch 'master' of https://github.com/nishant-jain/Middleware-dev
Deleting smack folder
Merge branch 'master' of https://github.com/nishant-jain/Middleware-dev