Merge branch 'master' of https://github.com/deviserbg/cms

Conflicts:
	.gitignore
	README.md