Aanpassingen na mail
Merge branch 'master' of https://github.com/eheiser/nailedit

Conflicts:
	css/modules.css
	css/screen.css
	sass/modules.scss
	sass/screen.scss