Final
Merge branch 'master' of https://github.com/Youhana-Hana/sQueue

Conflicts:
	AndroidManifest.xml
	src/mobi/MobiSeeker/sQueue/activites/Conversation.java