ignores
Merge branch 'master' of https://github.com/commabo/ecms

Conflicts:
	.gitignore