removed unused files
Merge remote-tracking branch 'origin/development' into Mette
fixed problems with the view
Merge remote-tracking branch 'origin/Mette' into development