diff text
Merge branch 'master' of https://github.com/MartijnHeuff/icm-ui

Conflicts:
	index.html
	src/beeldCtrl.js
	templates/beeld.html