Cambios para el paquete final
Merge branch 'master' of https://github.com/wozgeass/Aztli-Ubiquity-Slides

Conflicts:
	slideshows/ubuntu/slides/screenshots/Entretenimiento.png
	slideshows/ubuntu/slides/screenshots/Ides.png
	slideshows/ubuntu/slides/screenshots/Software.png