Merge branch 'feature/helloworld' into develop
Merge branch 'develop' of https://github.com/patrickvankann/gfws into feature/helloworld