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