reflecting the internal agreement from 2014-05-23, general rule 4 spaces, some special rules for html/xml
Merge branch 'master' of github.com:itagenten/project-archetype

Conflicts:
	.editorconfig