Appinjector bijgewerkt
Merge branch 'master' of https://github.com/fazed/IVH5B5

Conflicts:
	FysioSysteem/src/general/AppInjector.java