Start javadoc
Merge remote-tracking branch 'origin/master'

Conflicts solved:
	src/beveiliging/Toegangscontrole.java
Add html gif and css to .gitignore