More javadoc added.
Fixed merge conflict.
Merge branch 'master' of https://github.com/openhab/openhab
Fixed merge conflict #2
adding first version of MongoDB persistence
adding first version of MongoDB persistence (fix parent pom)
Merge pull request #947 from gerrieg/master

Initial commit of Astro binding - thanks @gerrieg for this great contribution
Merge pull request #983 from CrackerStealth/master

OpenSprinkler Binding Silent Fail with Java JDK 1.7 Fix
Merge branch 'master' into persist-mongodb
Merge pull request #846 from digitaldan/omnilink

initial commit for a HAI OmniLink binding for openHAB - thanks Dan for this great contribution
Merge pull request #861 from cdjackson/zwave-routing

Zwave routing and maaaany bugfixes
TinkerforgeBinding: Bricklet Multitouch wip.
Merge branch 'master' of https://github.com/berndpfrommer/openhab into berndpfrommer-master
TinkerforgeBinding: removed tinkerforge-2.0.14.jar from bin.excludes
Merge branch 'master' into zwave-products

* master:
  Fixed merge conflict #2
  Fixed merge conflict.
  More javadoc added.
  Added jdeb plugin
  Removed version from MANIFEST.MF
  Replaced OpenSprinkler library in OpenSprinkler binding with one that is compiled with Java JDK 1.7. For issue 841.
  Updated the since tag to 1.5.0
  More commenting, added a missing project file.
  grouped classes into packages and added @since 1.5.0 to headers
  update the version of the insteonplm binding to 1.5.0 in the pom file
  added insteonplm binding
  added System.setProperty() call to urtsi binding
  Azimuth and Elevation docs updated.
  build.properties fix
  Initial commit of Astro binding
  General cleanup of formatting and comments
  initial commit for a HAI OmniLink binding for oopenHAB
TinkerforgeBinding: Bricklet Multitouch wip.
Merge pull request #990 from cdjackson/zwave-routing

Zwave routing - a few missed changes
Merge pull request #988 from theoweiss/TFintegration

Motion Detector Bricklet support, update to TinkerForge API 2.1.0.2
Allowed configuration parameter 0.
Reformatted and fixed more javadoc fixes