Merge branch 'hotfix/disconnect'
Merge branch 'develop'
#33 Added user store locations