admin
Merge branch 'master' of https://github.com/estrategasdigitales/arbok

Conflicts:
	application/controllers/acceso/login.php
	application/controllers/admin/admin.php
	application/models/admin/admin_model.php
	application/views/admin/asignarParticipantes.php
	application/views/admin/showGrupos.php
	application/views/admin/showPreguntas.php
	includes/funcionesGeneralesAdmin.js
	system/libraries/Session.php