changes
Merge branch 'master' of https://github.com/Weldeasy/godcode

Conflicts:
	application/controllers/admin.php
	application/models/administrador.php
	application/views/frontend/panel_inici/detailusuari.php