added show and edit view to resovisions
Merge branch 'resovision_controller_and_views' into development