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

Conflicts:
	tmp/cache/models/retosapp_cake_model_default_retos_list
	chidostmp/cache/models/retosapp_cake_model_default_retos_users
	tmp/cache/persistent/retosapp_cake_core_file_map
	tmp/cache/persistent/retosapp_cake_core_method_cache