cambios de lunes
Merge branch 'master' of https://github.com/miguel-solis/retosapp
k
Conflicts:l kl
	tmp/cache/models/retosapp_cake_model_default_retos_list
	tmp/cache/models/retosapp_cake_model_default_retos_reportes k
	tmp/cache/models/retosapp_cake_model_default_retos_retoslk lk
	tmp/cache/models/retosapp_cake_model_default_retos_users
	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/persisten t/retosapp_cake_core_file_map
	kl  lktmp/cache/persistent/retosapp_cake_core_method_cache