Acentos y Menu corregido
Merge branch 'master' of https://github.com/adsgm/demos

Conflicts:
	preferencias.html