Merge om-signup-app fork back into FT master

Changes include using the colour user cases defined by om-signup and adjustments for error messaging as required on sign-up.