Merge branch 'hotfix-0.2.2'
Merge branch 'hotfix-0.2.2'
Fixed json issue with heroku (hopefully)
Merge branch 'hotfix-0.2.3' into dev