Merge branch 'master' into develop
Commit Android
Sense localhost