Test Merge
Merge branch 'master' of https://github.com/Wampirue/NEW_CMS

Conflicts:
	application/config/config.php