fix class path files of knx, netatmo and openenergymonitor projects
Merge pull request #822 from teichsta/fix-classpaths

fix class path files of knx, netatmo and openenergymonitor projects
Plugwise : fix configuration file parsing
Plugwise : fix quartz scheduling problem
merged patch provided by c.hoeflake in #355
reduced amount of variables
Merge pull request #824 from teichsta/onewire-type-enhancement

merged patch provided by c.hoeflake in #355
Merge pull request #823 from kgoderis/plugwise

Plugwise fixes (see email on mailing list)
Added Fibaro FG-RGBW controller (thanks Surendra)
Update command classes for Fibaro universal sensor
Merge pull request #825 from cdjackson/zwave-product

Added Fibaro FG-RGBW controller (thanks Surendra)
fixed typo
Merge branch 'master' of git@github.com:openhab/openhab.git
Standardise logging to allow identification of entries relating to a specific node.
Changed logging in manufacturer command class.
Add controller type/id/manufacturer to node.
This wasn't previously set as the controller doesn't support the manufacturer specific command class so this information was never set.
It is however read as part of the controller information, so this change simply adds this information to the node class.
Merge pull request #828 from cdjackson/zwave-controller-info

Add controller type/id/manufacturer to node.
Merge remote-tracking branch 'upstream/master'
merged from openhab master
Merge branch 'zwave-logging' of https://github.com/cdjackson/openhab into cdjackson-zwave-logging

Conflicts:
	bundles/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/ZWaveController.java