Merge branch 'ayke-http-errors' of git://github.com/aykevl93/kn-next into aykevl93-ayke-http-errors

Conflicts:
	README.md
Merge khandhas:/srv/dev.karpenoktem.nl/htdocs/kn-next