fixed typo
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 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
Added support for private url without username/password.
GCal now supports
1) url, username, password
2) url (without username/password)
Merge pull request #829 from lbo123/master

Added support for private url without username/password.
Revert "Added support for private url without username/password."

This reverts commit 1a0f799fa9c1234b513cd6480d34f64856586257.
Google calendar: Added support for "Private Address" URL without authentification (added missing lines to be backward compatible)"
Merge pull request #833 from lbo123/master

Google calendar: Added support for "Private Address" URL without authent...
changed fornax-oaw-m2-plugin version to 3.4.0
Fix error in log causing formatting exception
Merge pull request #835 from cdjackson/zwave-bugfix

Fix error in log causing formatting exception
Merge branch 'master' into HABmin

* master:
  Fix error in log causing formatting exception
  changed fornax-oaw-m2-plugin version to 3.4.0
  Google calendar: Added support for "Private Address" URL without authentification (added missing lines to be backward compatible)"
  Revert "Added support for private url without username/password."
  Added support for private url without username/password. GCal now supports 1) url, username, password 2) url (without username/password)
  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.
  Changed logging in manufacturer command class.
  Standardise logging to allow identification of entries relating to a specific node.
  fixed typo