added conceptual uml
Merge branch 'finn' of https://github.com/finninde/fellesprosjekt into finn