forgot to merge binding.xml
Merge branch 'master' of git@github.com:ingen63/openhab.git

Conflicts:
	bundles/binding/org.openhab.binding.dmlsmeter/OSGI-INF/binding.xml