desktop
Merge branch 'master' of https://github.com/devdepvenezuela/YoAmoCordova

Conflicts:
	www/opciones/opcion0.html