Merge branch 'release/1.0.1-b4' into develop
documentation updates
was passing text rather than body content to the crossref parser
updates basic fixtures for site faq and flatpages
changes resources page from template to flatpage
Merge pull request #151 from researchcompendia/flatpage

Creates flatpage for resources for #135
Merge branch 'master' into develop
adds Resources page
adds Resources to bottom navbar
bumping versions and history
Merge branch 'release/1.0.1-b6'