[436537] Updated target definition and migrated code in order to compile

Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
Merge branch 'master' of https://github.com/eclipse/smarthome into Bug436537

Signed-off-by: Oliver Libutzki <oliver@libutzki.de>

Conflicts:
	targetplatform/SmartHome Runtime.launch
Xtext 2.6.1 update

Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
Xtext 2.6.1 update - Adapted pom.xml

Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
Merge pull request #32 from OLibutzki/Bug436537

#436537: Xtext 2.6 update