''
Merge branch 'master' of https://github.com/goksgreat/SubCMS

Conflicts:
	.gitignore