update
Merge branch 'master' of github.com:gbanm/cakephp

Conflicts:
	Controller/PostsController.php
	View/Layouts/default.ctp
	View/Posts/view.ctp
	webroot/css/layout.css