navbar herschikken
Merge remote-tracking branch 'origin/master'

Conflicts:
	Android/TI3_G05_JoetzApp2/app/src/main/java/com/hogent/ti3g05/ti3_g05_joetzapp/navBarMainScreen.java