Latest changes
Merge branch 'master' of github.com:fmd/spree_fancy
Colour change