Merge
Merge https://github.com/lucha/test-repo

Conflicts:
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/logs/error.log