New Changes
Merge branch 'master' of https://github.com/icatalina/uon

Conflicts:
	generate.php
	www/en/gallery.html
	www/en/home.html
	www/en/menu.html
	www/es/gallery.html
	www/es/home.html
	www/es/menu.html