calender probeersel
Navbar
fb share werkt
navbar fix
Merge remote-tracking branch 'origin/master'
navbar small screen
Fragments drawer
Bond_moyson fragment + facebookfragment
Pass reset+ pass change method toegevoegd
Merge branch 'master' of https://github.com/Geoffry304/MobileOne

Conflicts:
	webapps/app/views/nav.html
profile android
andere afbeelding voor fb post
Inschrijven deels
Merge remote-tracking branch 'origin/master'

Conflicts:
	webapps/app/scripts/services/vakantie.js
homepagina fix
2
petit navbar
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
Merge branch 'master' into Steven