Merge branch 'release/Teun_1.0'
Merge branch 'release/release-1.0'
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
Merge branch 'master' of https://github.com/tberkers/Valid-Workshop-201406
Emergency fix for tough customer :)
Merge branch 'hotfix/Emergency_Fix' into develop
Merge branch 'develop' of https://github.com/tberkers/Valid-Workshop-201406 into develop