pull
Merge branch 'master' of https://github.com/cmdalbem/SmartClass

Conflicts:
	openhab-runtime-1.3.1/server/configuration/org.eclipse.osgi/.manager/.fileTable.4
	openhab-runtime-1.3.1/server/configuration/org.eclipse.osgi/.manager/.fileTable.5
	openhab-runtime-1.3.1/server/configuration/org.eclipse.osgi/.state.1
	openhab-runtime-1.3.1/workspace/.metadata/.log