Config base url, fixed bootstrap errors
Merge branch 'master' of https://github.com/loooweeen/DLAC_CMS

Conflicts:
	application/config/config.php