Merge branch 'master' of github.com:kicktipp/jawr-main-repo

Conflicts:
	.derived
Merge branch 'master' of github.com:kicktipp/jawr-main-repo