Merge remote-tracking branch 'carlos/desarrollo'

Conflicts:
	protected/runtime/application.log
Cambios modelo
Merge remote-tracking branch 'carlos/desarrollo'

Conflicts:
	protected/runtime/application.log
cambios
Merge remote-tracking branch 'carlos/desarrollo'
Servicios productos:finalizado

base para jqgrid,
base para fancybox,
Nombres de modelos amigables finalizados
prueba
Merge branch 'master' of https://github.com/dimortizp/tecnet into dimortizp-master

Conflicts:
	assets/51d2dedb/gridview/styles.css
	assets/d3c51f6d/mbmenu.css
	assets/d3c51f6d/mbmenu_iestyles.css
	assets/d3c51f6d/nav1_active.gif
	assets/d3c51f6d/nav1_bg.gif
	assets/d3c51f6d/nav1_sep.gif
	assets/d3c51f6d/nav2_last_li_bg.png
	assets/d3c51f6d/nav2_li_bg.png
	assets/d3c51f6d/nav2_link_bg.gif
	assets/d3c51f6d/nav2_parent_arrow.gif
	assets/d3c51f6d/nav3_bg.png
	assets/ecc7a112/mbmenu.css
	assets/ecc7a112/mbmenu_iestyles.css
	assets/ecc7a112/nav1_active.gif
	assets/ecc7a112/nav1_bg.gif
	assets/ecc7a112/nav1_sep.gif
	assets/ecc7a112/nav2_last_li_bg.png
	assets/ecc7a112/nav2_li_bg.png
	assets/ecc7a112/nav2_link_bg.gif
	assets/ecc7a112/nav2_parent_arrow.gif
	assets/ecc7a112/nav3_bg.png
	protected/components/AccessDataRol.php
	protected/runtime/application.log
	protected/views/servicio/asigna.php