Merge branch 'Test_metBugs' of https://github.com/Multec/Multec_IM_13_6 into Test_metBugs

Conflicts:
	src/total/TouchEventSource.java
	src/total/VideoScreen.java
bugfix in github