Configurated Cake
Merge branch 'master' into develop

Conflicts:
	app/Config/core.php
	app/Config/routes.php
	app/Controller/AppController.php
	app/View/Layouts/default.ctp
	app/View/Pages/home.ctp