Include KNYTTID as well
Merge branch 'master' of github.com:scriptotek/katapi

Conflicts:
	app/controllers/DocumentsController.php