Inicio trata de tecnicos
Merge remote-tracking branch 'carlos/master'

Conflicts:
	js/modules/orderModule.js
	protected/runtime/application.log
	protected/views/layouts/main.php
merge conflict