Working on MVC
Merge branch 'master' of github.com:initconnection/CMS

Conflicts:
	core/config.php