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