Merge branch 'hotfix/dumpdata-deserialize-issue30' into develop
fixed flake8 problem with supportingmaterials model
Merge remote-tracking branch 'origin' into develop
fixed flake8
changed concept of corresponding_author to site_owner and made site_owner optional in order to support memberless pages
removed left over corresponding_author kruft
added fixtures
added affiliation and country due to legacy content
removed slug, added legacyload script and made legacy fixture data
flake8 fix
removed slug
added remote debug setting
tap tap is heroku on?
Merge branch 'feature/import-old-data-issue8' into develop
changed list and detail view for companion pages
version number
Merge branch 'release/0.11.3'
Merge branch 'release/0.11.3' into develop
added Jenn's css to project.css
Merge branch 'develop'