amIDoneBugfix
Query save updated
Query save updated
Restoring Order at Arjun's Machine
Merge branch 'master' of https://github.com/nishant-jain/Middleware-dev

Conflicts:
	PubSubClient/bin/classes/com/middleware/pubsubclient/PublishQuery.class
	PubSubClient/bin/classes/com/middleware/pubsubclient/R$id.class
	PubSubClient/bin/classes/com/middleware/pubsubclient/R$layout.class
	PubSubClient/bin/classes/com/middleware/pubsubclient/R$menu.class
	PubSubClient/bin/classes/com/middleware/pubsubclient/R$string.class
	PubSubClient/bin/classes/com/middleware/pubsubclient/R$style.class
	PubSubClient/bin/classes/com/middleware/pubsubclient/R$xml.class
	PubSubClient/bin/classes/com/middleware/pubsubclient/RegisterMe.class
	ServerApplication/Src/QueryHandlerModule.py