Save user's location in parse DB
Merge branch 'master' of https://github.com/RTiK/FriendFinderProject

Conflicts:
	Code/FriendFinderApplication/project.properties

Code/FriendFinderApplication/src/com/summerschool/friendfinderapplicatio
n/activities/ConnectionActivity.java
asdf
metadata