implemented colour includes package rule (both ways)

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

Conflicts:
	MiniConfigurator/Public/j/app/modules/vehicle/rule.js

Signed-off-by: Chris Jones <chris@jonezy.org>