Merge branch 'devel'
Merge branch 'devel'
Merge branch 'hasdpk' of github.com:Som-Energia/plataforma into hasdpk
fix catalan translation bug in Som Energia theme & add more languages