endringer for sondre sin commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebAppH2014/Views/Shared/_Layout.cshtml