iets
Merge remote-tracking branch 'origin/Test2' into Test2

Conflicts:
	programm/IPMEDT4/IPMEDT4/res/layout/activity_main.xml