Test aangepast
Merge remote-tracking branch 'origin/master'

Conflicts:
	TactileAPI/src/nl/utwente/cs/caes/tactile/TouchPane.java