massive update to deleting marks, add mark page views, and editing marks
Merge branch 'master' of https://github.com/lockan/Group5Repo