Fix more errors
Add directives end marker
Merge branch 'fix-nl-translations' into develop

Conflicts:
	config/locales/nl.yml