Starting to add meeting info and map activities
service interface modified to support user id
Merge branch 'master' into slave

Conflicts:
	AndroidManifest.xml
	src/mag/joinus/activities/NewEventActivity.java
	src/mag/joinus/activities/UpcomingEventsActivity.java
	src/mag/joinus/model/Meeting.java
	src/mag/joinus/service/JoinusService.java
	src/mag/joinus/service/JoinusServiceImpl.java