Merge branch 'master' into Steven
Community, FirebaseMessages
Merge branch 'Steven'

Conflicts:

JoetzAndroid2/app/src/main/java/com/example/steven/joetzandroid/Activiti
es/VakantieAlgemeenFragment.java

JoetzAndroid2/app/src/main/java/com/example/steven/joetzandroid/Activiti
es/VakantieDetailActivity.java
	JoetzAndroid2/app/src/main/res/values/strings.xml
	JoetzAndroid2/facebook/build/intermediates/bundles/release/classes.jar
	JoetzAndroid2/facebook/build/outputs/aar/facebook-3.20.0.aar