Merge pull request #1 from hannes10/develop

Develop
merge 1
merge 2
merge from local server
Merge branch 'master' of https://github.com/hannes10/bitstarter into develop
push from local infra