test
Merge branch 'master' of https://github.com/fvenegasp/rondin

Conflicts:
	app/tmp/cache/models/myapp_cake_model_default_demo_list
	app/tmp/cache/models/myapp_cake_model_default_demo_recurso
	app/tmp/cache/models/myapp_cake_model_default_demo_usuario
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache
	app/tmp/logs/error.log