fix in status update
fix Friends
Merge branch 'master' into fix/map_friends

Conflicts:
	android/Projects/Meetup/src/main/AndroidManifest.xml

android/Projects/Meetup/src/main/java/com/adm/meetup/CalendarFragment.ja
va
Merge pull request #91 from lukaswelte/fix/map_friends

Fix/map friends