new event activity improved
Merge branch 'master' into slave

Conflicts:
	src/mag/joinus/activities/NewEventActivity.java
	src/mag/joinus/model/UserLocation.java
	src/mag/joinus/service/JoinusService.java
	src/mag/joinus/service/JoinusServiceImpl.java