Merge branch 'master' into form-fixes

Signed-off-by: Chris Jones <chris@jonezy.org>
fixes after a round of testing to the forms.

Signed-off-by: Chris Jones <chris@jonezy.org>
set the page bg's back to the original state (added a missing paceman
bg as well)

Signed-off-by: Chris Jones <chris@jonezy.org>
Merge branch 'form-fixes' of github.com:jonezy/buildmymini.ca into form-fixes