prueba
Merge remote-tracking branch 'carlos/master'

Conflicts:
	protected/runtime/application.log
asd
arreglo grilla

+ gitignore para assets
Cambios en la base de datos
Merge remote-tracking branch 'carlos/master'

Conflicts:
	js/modules/orderModule.js
	protected/runtime/application.log
	protected/views/layouts/main.php
merge conflict
Merge pull request #10 from dimortizp/master

Cambios modelos