commetaar toegevoegd
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
Merge branch 'develop' of https://github.com/tberkers/Valid-Workshop-201406 into develop
Merge branch 'hotfix/Emergency_Fix' into develop
Merge branch 'develop' of https://github.com/tberkers/Valid-Workshop-201406 into develop
Removed crappy method
Merge branch 'master' of https://github.com/tberkers/Valid-Workshop-201406 into develop
Merge branch 'develop' of https://github.com/tberkers/Valid-Workshop-201406 into develop
Merge branch 'develop' of https://github.com/tberkers/Valid-Workshop-201406 into develop
Merge branch 'develop' into hotfix/hotfix-Roger-0.1
Merge branch 'develop' into hotfix/hotfix-Roger-0.1
Merge branch 'hotfix/fix-robert'