Changes to classes so they match glossary. Also removed EditPageActivity.java
Merge pull request #51 from moorej12/master

Changes to classes so they match glossary. Also removed EditPageActivity
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project