Merge branch 'koeOversikt' of http://github.com/tedjk/SKS-2.0 into godkjenn
liten endring i godkjennKontroller og noe form endring i jsp fila
Merge branch 'master' of http://github.com/olveandre/SKS-2.0