Agregue la Recepcion
Agregue la Recepcion
Agregue la Recepcion
Merge origin/master

Conflicts:
	cakephp/app/tmp/cache/models/myapp_cake_model_default_freymca_clientes
	cakephp/app/tmp/cache/models/myapp_cake_model_default_freymca_list
	cakephp/app/tmp/cache/persistent/myapp_cake_core_file_map
	cakephp/app/tmp/cache/persistent/myapp_cake_core_method_cache
	cakephp/app/tmp/logs/error.log