js bug
Merge branch 'master' of https://github.com/hultsfredskommun/hultsfredskommun

Conflicts:
	js/hultsfred.js