poi info activity should be bug free
Merge remote-tracking branch 'origin/master'

Conflicts:

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