Merge branch 'popolo-dev' of github.com:openpolis/op_api3 into popolo-dev
Merge branch 'popolo-dev' of github.com:openpolis/op_api3 into popolo-dev
django popolo added as requirements from the github repo (in production)
Merge branch 'places-dev' of github.com:openpolis/op_api3 into popolo-dev
allowed hosts set to * in production
conflict solved after merge