Merge branch 'dev'
corrected jenkins url
corrected jenkins url
Merge pull request #1 from autermann/master

Merge master changes