temps
Merge branch 'master' of https://github.com/miguel-solis/retosapp

Conflicts:
	tmp/cache/models/retosapp_cake_model_default_retos_ganadores
	tmp/cache/models/retosapp_cake_model_default_retos_list
	tmp/cache/models/retosapp_cake_model_default_retos_posts
	tmp/cache/models/retosapp_cake_model_default_retos_premios
	tmp/cache/models/retosapp_cake_model_default_retos_reportes
	tmp/cache/models/retosapp_cake_model_default_retos_retos
	tmp/cache/models/retosapp_cake_model_default_retos_users
	tmp/cache/models/retosapp_cake_model_default_retos_users_retos
	tmp/cache/persistent/retosapp_cake_core_cake_dev_en-us
	tmp/cache/persistent/retosapp_cake_core_cake_en-us
	tmp/cache/persistent/retosapp_cake_core_default_en-us
	tmp/cache/persistent/retosapp_cake_core_file_map
	tmp/cache/persistent/retosapp_cake_core_method_cache
	tmp/logs/error.log
	tmp/sessions/sess_4a7e5kikg2v8rrn1itkdetjig5
	tmp/sessions/sess_ob9aj1lpt7cjvs3ihl6vl33qd0