Merge branch 'master' of https://github.com/Jveenstra1988/editall

Conflicts:
	css/style.css
	js/main.js
spannend
probeersel
hoi