Cambios en Js y el index
Merge branch 'html5' of https://github.com/MarioASM/saammobile into html5

Conflicts:
	web/js/principal.js