CAnvis Oscar
:wqMerge branch 'develop' of github.com:UPCnet/genweb.theme into develop

Conflicts:
	genweb/theme/stylesheets/genwebupc-ie-blessed1.css
	genweb/theme/stylesheets/genwebupc-ie.css
	genweb/theme/stylesheets/genwebupc.css