donno
Merge branch 'master' of https://github.com/RikJurriaans/FED2

Conflicts:
	trunk/Deeltoets1/js/utils/StrictType.js
	trunk/Eindopdracht/js/all.min.js