Albert's changes
Merge branch 'develop' of github.com:UPCnet/genweb.theme into develop