add nationality to Account Activity
Added map to menu and UI Changes
travis badge updated [skip ci]
Merge branch 'master' into Calendar-Design

Conflicts:
	android/Projects/Meetup/build.gradle

android/Projects/Meetup/src/main/java/com/adm/meetup/EventListAdapter.ja
va
	android/Projects/Meetup/src/main/java/com/adm/meetup/MainActivity.java
	android/Projects/Meetup/src/main/res/values/strings.xml
Merge branch 'master' into Calendar-Design

Conflicts:
	android/Projects/Meetup/build.gradle

android/Projects/Meetup/src/main/java/com/adm/meetup/EventListAdapter.ja
va
	android/Projects/Meetup/src/main/java/com/adm/meetup/MainActivity.java
	android/Projects/Meetup/src/main/res/values/strings.xml
Merge pull request #70 from lukaswelte/Calendar-Design

Added map to menu and UI Changes
Fix crash when fetching events
Merge pull request #73 from lukaswelte/fix/eventCrashOnFetch

Fix crash when fetching events
Event Design
Merge pull request #74 from lukaswelte/Event-Design

Event Design
fix Button
Friends Button + minor changes
Merge pull request #75 from lukaswelte/Design-Stuff

Friends Button + minor changes
list of friends ui
begin add of friend in map
Refactorings and various little fixes
Design Changes
Merge branch 'master' into Design-Stuff

Conflicts:

android/Projects/Meetup/src/main/java/com/adm/meetup/CalendarFragment.ja
va
Merge pull request #77 from lukaswelte/Design-Stuff

Design Changes
minor Changes
Merge pull request #78 from lukaswelte/Changes

minor Changes