Merge branch 'master' of https://github.com/DeveloperOnCall/wandcms

Conflicts:
	.gitignore