Oppdatert submodul
Merge branch 'master' of github.com:hiof/dev-framework

Conflicts:
	app/assets