Merge branch 'hotfix/1.1' into develop
Add spanish homepage
Merge branch 'release/1.2'