edit reports return views
Merge branch 'controller' into dev