Upgrade dependencies. Fix tests.
Merge branch 'master' of github.com:eiriksm/orkjern_theme

Conflicts:
	package.json