Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge pull request #18 from Studentmediene/develop

Develop
Merge branch 'release-0.1.0-beta'
Merge branch 'release-0.1.1-BETA'
Merge branch 'release-0.1.2-SNAPSHOT'
Merge branch 'develop'
build