Continuing work on updating javadocs and UML diagrams.
Merge branch 'master' of https://github.com/CMPUT301W14T08/GeoChan

Conflicts:
	GeoChan/src/ca/ualberta/cmput301w14t08/geochan/models/GeoLocationLog.java
	GeoChanTests/src/ca/ualberta/cmput301w14t08/geochan/test/GeoLocationLogTest.java
Continuing update of UML and javadocs.