Merge branch 'master' of git@github.com:ingen63/openhab.git

Conflicts:
	bundles/binding/org.openhab.binding.dmlsmeter/.classpath
	bundles/binding/org.openhab.binding.dmlsmeter/src/main/java/org/openhab/binding/dmlsmeter/internal/DmlsMeterBinding.java
	bundles/binding/org.openhab.binding.dmlsmeter/src/main/java/org/openhab/binding/dmlsmeter/internal/DmlsMeterGenericBindingProvider.java
	bundles/binding/org.openhab.binding.dmlsmeter/src/main/java/org/openhab/binding/dmlsmeter/internal/DmlsMeterReader.java
	bundles/binding/org.openhab.binding.dmlsmeter/src/main/java/org/openhab/binding/dmlsmeter/internal/DmlsMeterReaderImpl.java
	bundles/binding/org.openhab.binding.dmlsmeter/src/main/java/org/openhab/binding/dmlsmeter/internal/SimulateDmlsMeterReader.java
Merge remote-tracking branch 'origin/master'