Recovered old control/view stuff
Merge branch 'recovery' into articles
weird workaround; controller was getting deleted after merge
Merge branch 'recovery' into articles
weird fix for merge problem with controller
Fixed other weird copying problems