pre
pre
Merge branch 'master' of https://github.com/mariano55555/cmype

Conflicts:
	tmp/cache/models/myapp_cake_model_default_conamype_access
	tmp/cache/models/myapp_cake_model_default_conamype_actions_tables_users
	tmp/cache/models/myapp_cake_model_default_conamype_documentos_users
	tmp/cache/models/myapp_cake_model_default_conamype_empleados
	tmp/cache/models/myapp_cake_model_default_conamype_evaluaciones
	tmp/cache/models/myapp_cake_model_default_conamype_groups
	tmp/cache/models/myapp_cake_model_default_conamype_list
	tmp/cache/models/myapp_cake_model_default_conamype_periodos
	tmp/cache/models/myapp_cake_model_default_conamype_poas
	tmp/cache/models/myapp_cake_model_default_conamype_roles_evaluaciones
	tmp/cache/models/myapp_cake_model_default_conamype_users
	tmp/cache/persistent/myapp_cake_core_cake_dev_es-es
	tmp/cache/persistent/myapp_cake_core_cake_es-es
	tmp/cache/persistent/myapp_cake_core_default_es-es
	tmp/cache/persistent/myapp_cake_core_file_map
	tmp/cache/persistent/myapp_cake_core_method_cache
conamype pre