Merge branch 'fix-requirements'
Merge branch 'release-1.1'
Added Procfile and psycopg2
Merge branch 'heroku-fix' into develop