Display users of a group on a map + toggles
Merge branch 'master' of https://github.com/RTiK/FriendFinderProject

Conflicts:
	Code/FriendFinderApplication/res/layout/activity_map.xml

Code/FriendFinderApplication/src/com/summerschool/friendfinderapplicatio
n/activities/MapActivity.java