updated model
updated model
Merge branch 'master' of github.com:MobileSensors/MobSens

Conflicts:
	Klassifikation/MobileSensorsTest/src/MobileSensors/Test/MobSensTest.java