Add digital-marketplace-ssp-content as a submodule of the project.
I have put it in a folder 'content', which seems a reasonable place for it - I've tested building a .war file for deployment and the new folder is included in the .war package.
Use a single controller to display question pages; move question page templates into single 'QuestionPages' package.
Merge branch 'master' of github.com:alphagov/supplier-submission-portal
Merge branch 'master' into split-out-partials
Fix template name (main.html->layout.html).