Merge branch 'release/Teun_1.0' into develop
Merge branch 'develop' of https://github.com/tberkers/Valid-Workshop-201406
Merge branch 'master' of https://github.com/tberkers/Valid-Workshop-201406
Merge branch 'master' of https://github.com/tberkers/Valid-Workshop-201406