split new marker activity into event and poi
same
Merge branch 'master' of https://github.com/RTiK/FriendFinderProject

Conflicts:
	Code/.metadata/.plugins/org.eclipse.core.resources/.projects/FriendFinderApplication/.indexes/a0/5f/properties.index
	Code/FriendFinderApplication/res/layout/activity_new_marker.xml
	Code/FriendFinderApplication/src/com/summerschool/friendfinderapplication/activities/MapActivity.java
	Code/FriendFinderApplication/src/com/summerschool/friendfinderapplication/activities/NewEventActivity.java
merge