Minor bug fixes
Merge branch 'new_branch_name'
Merge branch 'master' of github.com:egeniq/egeniq-android