Merge branch 'master' of https://github.com/shinix01/ClansGamersCMS

Conflicts:
	app/Config/bootstrap.php
	app/Plugin/Media/webroot/js/redactor/redactor.min.js
zrdz
test