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

Conflicts:
	Controller/AppController.php
	Controller/UsersController.php
	View/Layouts/default.ctp
	View/Posts/add.ctp
	View/Posts/view.ctp
	tmp/cache/models/cakeauth_cake_model_default_cakeauth_list
	tmp/cache/models/cakeauth_cake_model_default_cakeauth_posts
	tmp/cache/models/cakeauth_cake_model_default_cakeauth_users
	tmp/cache/persistent/cakeauth_cake_core_file_map
	tmp/cache/persistent/cakeauth_cake_core_method_cache
	tmp/logs/error.log