Merge branch 'master' into iccs-toevoegen

Conflicts:
	kunst-menu.iml
Added teacher resource
Added teacher resource
Merge branch 'master' into iccs-toevoegen
Some UI added
Added fonts
add and delete working
Added editing teachers
Merge pull request #3 from utwente-di/iccs-toevoegen

Iccs toevoegen
Merge branch 'master' into activiteiten-toevoegen