Merge branch 'hotfix/0.0.4-1'
Herokufix
Disable user creation
Merge branch 'master' into develop