Merge pull request #43 from Blisst-Mobile/development

Development
Merge branch 'development' of https://github.com/Blisst-Mobile/Android