Merge pull request #53 from ipa-fmw/master

tested updates
Merge branch 'master' of github.com:ipa320/jenkins_setup
wet and dry test working