Make sure commercial messages are only displayed in English or Spanish
Merge branch 'master' into jacalvo/unify-pos
Commercial messages are included now in the same .po
updated pos from source after subscription merge
use locale() instead of $LANG

and added missing warnings/strict (removing also wrong call to EBox::Config::version)
real fix for the failed INIT workaround
Merge pull request #1104 from Zentyal/jacalvo/unify-pos

Jacalvo/unify pos