Merge with current master branch

* 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

* master: (86 commits)
  added org.openhab.io.multimedia.tts.speechdispatcher to the build
  added -D java.awt.headless=true parameter to Designer LaunchConfig
  added missing bundles
  removed gcal and freetts
  fixed race condition in insteonplm originally submitted as pull request openhab#1706 by cfrede001
  Add benext built in dimmer openhab#1139
  Add FortrezZ alarm openhab#1139
  Fixed copy/paste bug
  updated openhab.cfg to reflect new more_features option for the insteonplm binding
  added more_features option to define new feature templates on the fly
  Initial checkin for the MiOS Bridge Binding.
  Added support for Mac.
  Removed item object dependency
  Review comments from Thomas for PR # 1469
  Modified level of some debug output. Moved CoreTypeMapperTest to the correct folder.
  Revert "Merge branch 'master' of https://github.com/openhab/openhab into weather openhab#2"
  MaxCube added more documentation to config
  Max!Cube removed useless includes
  Max!Cube changed some author tags
  added Max!Cube S-Message and MaxRequestsPerConnection option
  ...

* zwave-database_updates:
  Split versions for FGD211
  newline
  Processed feedback
  MiOS: Add missing aliases for common UPnP ServiceId's
  add SamsungAc Test to build
  MAX! Binding improved discovery of the Cube
  Support for String and Number items in pilight binding
  Added functionality to set baud rate of the serial port on initialization: /dev/ttyACM0@115200 will init the port with a baud rate of 115200. Backward compability is given, as if no baud rate is specified, like /dev/ttyACM0 the serial binding defaults to 9600 bauds.
  MiOS: Only change Item state during incremental updates from MiOS Unit
  Update version of samsungac.test pom
  Moving source to weather binding
  Some missing files openhab#2
  Some missing files
  Introducing some help function in Weather actions along with Weather Binding

Update fork

Dan's changes to new config options

Some further cleanup

* master: (216 commits)
  #992
  revert changes
  Revert
  revert changes
  Reverted
  Format
  Add chart 2.3.2
  Update chart provider to handle OnOff and OpenClosed types
  fixing MongoDB persistence
  Reformatted and fixed more javadoc fixes
  Reformatted and fixed more javadoc fixes
  Allowed configuration parameter 0.
  TinkerforgeBinding: removed tinkerforge-2.0.14.jar from bin.excludes
  adding first version of MongoDB persistence (fix parent pom)
  adding first version of MongoDB persistence
  Fixed merge conflict #2
  Fixed merge conflict.
  More javadoc added.
  Added jdeb plugin
  Removed version from MANIFEST.MF
  ...

only install feature if name is not blank

Updates and fixes for your ISY binding

Hi - this PR adds my own updates to the ISY binding:
•support for locks
•support for heartbeat and battery types
•A bunch more examples in the readme

While testing, I also discovered a couple of bugs that I fixed:
•in the parseConfig function in ISYGenericBindingProvider.java, the function was returning 'address' twice instead of 'controller' and 'address'
•I changed the logic in the config parser in ISYActiveBindingConfig.java. It was only reading user and password if uPnP was not being used. User and password is required for both uPnP and non-uPnP cases.

added JFrog OSS repo for retrieving snapshot versions

implement usage of RollerShutter item for modbus binding openhab#2

Merge with master

Merge pull request openhab#2 from openhab/master

Merge with master

initial contribution of the pulseaudio binding, including discovery
service

Signed-off-by: Tobias Bräutigam <tbraeutigam@gmail.com>

- check if the server is connectable before creating a bridge for it
- add binding to pom.xml

Signed-off-by: Tobias Bräutigam <tbraeutigam@gmail.com>

use real pulseaudio item names

Signed-off-by: Tobias Bräutigam <tbraeutigam@gmail.com>

- finer grained thing definitions
- sink-inputs can be rerouted

Signed-off-by: Tobias Bräutigam <tbraeutigam@gmail.com>

- fixed misdefined channel
- some code cleanup

Signed-off-by: Tobias Bräutigam <tbraeutigam@gmail.com>

the mdns bundles name has changed

Signed-off-by: Tobias Bräutigam <tbraeutigam@gmail.com>

missing part of the last commit

Signed-off-by: Tobias Bräutigam <tbraeutigam@gmail.com>

changes due to Kai´s code review

Signed-off-by: Tobias Bräutigam <tbraeutigam@gmail.com>

log message removed

Signed-off-by: Tobias Bräutigam <tbraeutigam@gmail.com>

moved client connection into a scheduled runnable

Signed-off-by: Tobias Bräutigam <tbraeutigam@gmail.com>

Signed-off-by: Antoine Besnard <stratehm@hotmail.com>

Issue openhab#2: Initial commit for SSL Certificate generation bundle