Combined the html partials and controllers for the error pages into one, making it easier to add in additional error pages for the rest of the app.
Merge branch 'errorscombine' into dev