perfiles
Merge branch 'master' of https://github.com/MagicBone/fisusm

Conflicts:
	js/administrador-secciones.js