Show and hide POIs on the map
Merge branch 'master' of https://github.com/RTiK/FriendFinderProject

Conflicts:

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