02: Working on Authentication
Merge branch 'Android' of https://github.com/abusalam/SiteRepo into Android

Conflicts:
	android/Contact.php
	android/Group.php
	android/Message.php
	android/MessageAPI.php
	android/User.php
	android/index.php
	android/sql.defs.php