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