Merge branch 'release/v0.8.4'
Merge branch 'master' of https://github.com/baasio/baas.io-startup-android into develop