forms now validate based on whether you prefer email or phone

Signed-off-by: Chris Jones <chris@jonezy.org>
getting packagemerging code into test

Signed-off-by: Chris Jones <chris@jonezy.org>
test to validate that package merge correctly

Signed-off-by: Chris Jones <chris@jonezy.org>
flag specs in the ui as auto/man

Signed-off-by: Chris Jones <chris@jonezy.org>
added optional icon to legend, made legal modal wider

Signed-off-by: Chris Jones <chris@jonezy.org>
Merge pull request #278 from jonezy/master

Lots of small things, plus some unit tests around package merging.
fixed issue with image and colour swatches shifting.

Signed-off-by: Chris Jones <chris@jonezy.org>
fixed some feauture label annotations

Signed-off-by: Chris Jones <chris@jonezy.org>
attempt at testing staticcontroller (not working, not broken either)

Signed-off-by: Chris Jones <chris@jonezy.org>
Merge pull request #279 from jonezy/master

synching with upstream
Merge branch 'master' of https://github.com/RichmondDay/www.mini.ca
Fixed check box ( still needs some work ) Added switch to view model specific filtering