Use Extra to save POI's location
Merge remote-tracking branch 'origin/master'

Conflicts:

	Code/FriendFinderApplication/src/com/summerschool/friendfinderapplication/activities/NewMarkerActivity.java
Merge remote-tracking branch 'origin/master'

Conflicts:

	Code/FriendFinderApplication/src/com/summerschool/friendfinderapplication/activities/NewMarkerActivity.java