Merged shell
Merged shell
Merged
Merged
Merge origin/master

Conflicts:
	NAM.WebApp/public_html/js/NAM_app/viewmodels/shell.js
Merge origin/master
Made page for "min statistikk"