Important Fixes, server only
Merge branch 'master' of https://github.com/nishant-jain/Middleware-dev
Merge branch 'master' of https://github.com/nishant-jain/Middleware-dev
amIDoneBugfix
Query save updated
Query save updated
Server Message
ServerFix
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
Fixed Registration Module and Models

To account for Activity Recognition and Downloadable Content
Capabilities. Registration Module fixed for the new message format.
Merge branch 'master' of https://github.com/nishant-jain/Middleware-dev
LocalCommit
Merge branch 'master' of https://github.com/nishant-jain/Middleware-dev

Conflicts:
	ServerApplication/Src/Models.py
	ServerApplication/Src/RegistrationModule.py
LocalCommit2
Merge branch 'master' of https://github.com/nishant-jain/Middleware-dev
Merge branch 'master' of https://github.com/nishant-jain/Middleware-dev
bugfixes on Server
resolve server merge
Merge branch 'master' of https://github.com/nishant-jain/Middleware-dev