More fixes
Merge branch 'master' of github.com:ekkodill/jalla

Conflicts:
	minside.php
	vis_brukere.php