asdf
dfsa
glubsch
Merge branch 'master' of https://github.com/latzelsperger/TeachDroid.git

Conflicts:
	TeachDroid/datalink/com/keba/kemro/kvs/teach/util/KvtPositionMonitor.java