maj
maj
Merge branch 'Geolocalization_kony_v2' of https://github.com/Lighty04/friend_finder into Geolocalization_kony_v2

Conflicts:
	FriendFinder/res/layout/activity_main.xml
	FriendFinder/src/com/example/friendfinder/MainActivity.java