Silje endringer
Merge remote-tracking branch 'origin/Silje'

Conflicts:
	Admin/Admin.aspx.cs
Merge complete