Finished Color Feature
fixed color feature
fixed color feature
Merge branch 'release/release-Remco-1.0' into develop
Merge branch 'develop' of https://github.com/tberkers/Valid-Workshop-201406 into develop