Up to date with changes since february in the develop branch
Merge branch 'develop' of github.com:UPCnet/genweb.alternatheme into develop