Merge branch 'channel-xml-extensions' of https://github.com/qivicon/smarthome into qivicon-channel-xml-extensions

Signed-off-by: Kai Kreuzer <kai@openhab.org>

Conflicts:
	bundles/core/org.eclipse.smarthome.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ChannelUID.java
	bundles/core/org.eclipse.smarthome.core.thing/src/main/java/org/eclipse/smarthome/core/thing/UID.java
	bundles/core/org.eclipse.smarthome.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelTypeUID.java
removed outdated project file

Signed-off-by: Kai Kreuzer <kai@openhab.org>
Merge branch 'qivicon-channel-xml-extensions' of https://github.com/kaikreuzer/smarthome into future-master

Conflicts:
	bundles/core/org.eclipse.smarthome.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ChannelUID.java
	bundles/core/org.eclipse.smarthome.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelTypeUID.java