daans sht gefixt

^
Daans sht gefixt v2.0

^
Merge remote-tracking branch 'origin/master'

Conflicts:
	FYSApp-master/src/view/admin/AdminFront.java