fixed
fixed
Merge origin/InDev into InDev

Conflicts:
	src/view/ApplicatieAddNewUser.java
	src/view/ApplicatieMenuBalk.form
	src/view/ApplicatieMenuBalk.java
	src/view/BalieMenuBalk.form
	src/view/BalieMenuBalk.java
	src/view/BalieRegisterLuggagePanel.java
	src/view/ManagerMenuBalk.form
	src/view/ManagerMenuBalk.java