edit reports return views
Merge branch 'controller' into dev
Merge branch 'View' into dev