Fixed broken links

Fixes https://github.com/flovan/headstart/issues/43
Merge branch 'master' into major-release-v2