Commit
Merge branch 'cake' of github.com:mdevlamynck/BookStarter into cake

Conflicts:
	app/tmp/cache/cake_toolbar_cache1863a474d36466d4a2b1b2fc4c5e48b0
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_fr-fr
	app/tmp/cache/persistent/myapp_cake_core_cake_fr-fr
	app/tmp/cache/persistent/myapp_cake_core_debug_kit_fr-fr
	app/tmp/cache/persistent/myapp_cake_core_file_map