mantenimiento completo
Merge branch 'master' of https://github.com/niuskamora/Page

Conflicts:
	administrator/crearusuario.php

	modified:   administrator/admin.php
 	modified:   administrator/crearadmin.php
 	modified:   administrator/crearinfo.php
 	modified:   administrator/crearmenu.php
 	modified:   administrator/crearproducto.php
 	modified:   administrator/crearsucursal.php
 	modified:   administrator/creartipoadmin.php
 	modified:   administrator/creartipoinfo.php
 	modified:   administrator/crearusuario.php
 	modified:   administrator/editaradmin.php
 	modified:   administrator/editarinfo.php
 	modified:   administrator/editarmenu.php
 	modified:   administrator/editarproducto.php
 	modified:   administrator/editarsucursal.php
 	modified:   administrator/editartipoadmin.php
 	modified:   administrator/editartipoinfo.php
 	modified:   administrator/editarusuario.php
 	modified:   administrator/eliminaradmin.php
 	modified:   administrator/eliminarinfo.php
 	modified:   administrator/eliminarmenu.php
 	modified:   administrator/eliminarproducto.php
 	modified:   administrator/eliminarsucursal.php
 	modified:   administrator/eliminartipoadmin.php
 	modified:   administrator/eliminartipoinfo.php
 	modified:   administrator/eliminarusuario.php
 	modified:   administrator/info.php
 	modified:   administrator/menu.php
 	modified:   administrator/principal.php
 	modified:   administrator/producto.php
 	modified:   administrator/submenu.php
 	modified:   administrator/sucursal.php
 	modified:   administrator/tipo2.php
 	modified:   administrator/tipoadmin.php
 	modified:   administrator/tipoinfo.php
 	modified:   administrator/usuario.php
 	modified:   administrator/veradmin.php
 	modified:   administrator/verinfo.php
 	modified:   administrator/versucursal.php
 	new file:   maqueta.php
	modified:   recursos/css/estilogeneral.css
	modified:   recursos/js/funciones.js