^ppp
Merge branch 'API2' of https://github.com/Lighty04/friend_finder.git into API2
Get A marker/ get all the markers and save a markers
Same
Marker functions
commit
Merge branch 'API2' of https://github.com/Lighty04/friend_finder into API2

Conflicts:
	FriendFinder/src/com/example/friendfinder/DatabaseHelper.java
	FriendFinder/src/com/example/friendfinder/LoginActivity.java
	FriendFinder/src/com/example/friendfinder/MainActivity.java
Merge branch 'API2' into Geolocalization_kony_v2

Conflicts:
	FriendFinder/AndroidManifest.xml
	FriendFinder/res/values/strings.xml
	FriendFinder/src/com/example/friendfinder/Business.java
	FriendFinder/src/com/example/friendfinder/DatabaseHelper.java
	FriendFinder/src/com/example/friendfinder/MainActivity.java
commit
Merge branch 'Geolocalization_kony_v2' of https://github.com/Lighty04/friend_finder into Geolocalization_kony_v2

Conflicts:
	FriendFinder/src/com/example/friendfinder/Business.java
	FriendFinder/src/com/example/friendfinder/DatabaseHelper.java
	FriendFinder/src/com/example/friendfinder/MainActivity.java