list of friends ui
begin add of friend in map
list of friends ui done
add friend from map done
facebook libs !?
Merge branch 'master' into profile5

Conflicts:

android/Projects/Meetup/src/main/java/com/adm/meetup/AccountActivity.jav
a
	android/Projects/Meetup/src/main/res/values/strings.xml
changes Facebook Login + Account

fixed Facebook login when email is not a public information  (is null)
+ remove email from Account since it can be null
Merge pull request #81 from lukaswelte/profile5

fixed Facebook login when email is not a public information (is null) + remove email from Account since it can be null
Merge branch 'master' into feature/friends_list_UI

Conflicts:

android/Projects/Meetup/src/main/java/com/adm/meetup/LoadMapFragment.jav
a
Merge pull request #82 from lukaswelte/feature/friends_list_UI

Feature/friends list ui
Friends Design
Merge pull request #83 from lukaswelte/Design-Friends

Friends Design
Merge branch 'master' into fix/Events

Conflicts:
	android/Projects/Meetup/src/main/res/values/strings.xml