Comments on config changes
Merge branch 'dev'
Force lang to es