administracion de usuarios V1.2.1
Merge branch 'master' of github.com:ronsuez/serv-comunitario-ucab

Conflicts:
	mvc/application/config/routes.php
	mvc/application/controllers/administrador.php
	mvc/application/views/js/main.js