commit for å pulle
Merge branch 'master' of https://github.com/sanitec/nettavis
ok
Merge branch 'master' of https://github.com/sanitec/nettavis

Conflicts:
	nettavis/AU/default.aspx.cs
mdf
Merge branch 'master' of https://github.com/sanitec/nettavis

Conflicts:
	nettavis/AU/Games/LesAnmeldelse.aspx.cs
Bedre innlasting til forside
Merge branch 'master' of https://github.com/sanitec/nettavis
Default of FilmDefault laster innhold