primera actualizacion
Merge branch 'master' of https://github.com/edgarmch/cafeteria into rodrigo

Conflicts:
	app/tmp/cache/models/myapp_cake_model_default_cafeteria_catalogos
	app/tmp/cache/models/myapp_cake_model_default_cafeteria_list
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache
	app/tmp/logs/error.log
tipo productos
Merge branch 'master' of https://github.com/edgarmch/cafeteria into rodrigo
base datos loca
Merge branch 'master' of https://github.com/edgarmch/cafeteria into rodrigo
agregados controladores y modelos