More matching to the new UML
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics

Conflicts:
	docs/UML/Generic-MVC-version.class.violet.html