modified:   application/models/DbTable/Waermetauscher.php
	modified:   application/models/WaermetauscherMapper.php
	modified:   application/models/WaermetauscherUnterkategorie.php
Merge branch 'master' of github.com:blackravendb/therminox