V1.1.5 commit
Merge branch 'master' of https://github.com/Olocode-dev/droidApp.git