Fixing stuff
Merge branch 'master' of github.com:yondri/migros-mobile