asd
Merge branch 'master' of https://github.com/sanitec/nettavis
asda
Merge branch 'master' of https://github.com/sanitec/nettavis

Conflicts:
	nettavis/AU/GetArtikkel.cs
	nettavis/App_Data/ASPNETDB.MDF
	nettavis/App_Data/aspnetdb_log.LDF
Merge branch 'master' of https://github.com/sanitec/nettavis
asd
Merge branch 'master' of https://github.com/sanitec/nettavis
Prøver å fikse ajaxbajs på typeDefault og er-diagram ser mer ryddig ut
Merge branch 'master' of https://github.com/sanitec/nettavis