Merge branch 'release/version1'
Merge branch 'develop'
Merge pull request #1 from frankenpfalzer/develop

fitfth file on second feature
Merge commit '4ebc5d916314524d31fc6fdaa5bbbde6a56522db' into develop