Merge branch 'hotfix-0.2.1'
Adjusted Procfile to try to fix staticfiles issue
Merge branch 'hotfix-0.2.2' into dev
Fixed Procfile
Merge branch 'hotfix-0.2.2' into dev