Merge branch 'master' of https://github.com/RTiK/FriendFinderProject

Conflicts:
	Code/FriendFinderApplication/AndroidManifest.xml