Endring editAvtale og database
HEI
Merge branch 'master' of https://github.com/hermanferre/fellesprosjekt
Merge branch 'master' of https://github.com/hermanferre/fellesprosjekt
HEI
Merge branch 'master' of https://github.com/hermanferre/fellesprosjekt