Merge branch 'release/release-0.2' into develop
Merge branch 'hotfix/missing-log4j-properties' into develop
Merge branch 'master' into feature/currentWork
refine logging and switch to timed connectToServer call
Merge branch 'feature/currentWork' into develop
Merge branch 'release/release-0.3'