Merge branch 'hotfix/0.2.1'
fixed database password
Merge branch 'hotfix/0.2.2' into develop