update
Merge branch 'master' of https://github.com/Joelgullander/bibloteksapplikation

Conflicts:
	script/js_admin.js