from seb
Merge branch 'Geolocalization_kony_v2' of
https://github.com/Lighty04/friend_finder.git into
Geolocalization_kony_v2

Conflicts:
	FriendFinder/AndroidManifest.xml