Merge branches 'master' and 'master' of https://github.com/selindmarkl/H-lsoboken-beta1

Conflicts:
	www/config.xml
uppdaterat
Merge branch 'master' of https://github.com/selindmarkl/H-lsoboken-beta1

Conflicts:
	www/config.xml