Håvard M. Ottestad

moved around the activity and plan classes to not be subclasses of each other an…

…d have a flatter structure
This diff could not be displayed because it is too large.