Changed some methods in controllers and models, updated UML
Merge branch 'master' of https://github.com/CMPUT301F14T09/Team09Project