Deleted view
Merge branch 'ModifyingView' into Develop
Added file
Merge branch 'BugFixing' into Develop