Tests
Merge remote-tracking branch 'origin/master'
PropertyReader fuer connection
Merge remote-tracking branch 'origin/master'