class path
Merge branch 'main_refactoring' of https://github.com/CMPUT301W14T13/Team13GPSCommentLogger into javadoc

Conflicts:
	RefactoredProjectTest/.classpath
Merge error fixes
Sort class/functions javadoc'd
javadocing CommentTreeElement, not done
finished javadocing CommenTreeElement
controller javadoc progress
Merge branch 'javadoc' of https://github.com/CMPUT301W14T13/Team13GPSCommentLogger into javadoc
 finished javadocing model.content package, currently javadocing views
Merge branch 'javadoc' of https://github.com/CMPUT301W14T13/Team13GPSCommentLogger into javadoc
Controllers javadoc'd
Merge branch 'javadoc' of https://github.com/CMPUT301W14T13/Team13GPSCommentLogger into javadoc
 finished javadocing model.view package, needs peer review
Merge branch 'javadoc' of https://github.com/CMPUT301W14T13/Team13GPSCommentLogger into javadoc
finished javadoc for MapViewController and NetworkReceiver
Formatting
Merge branch 'javadoc' of https://github.com/CMPUT301W14T13/Team13GPSCommentLogger into javadoc
javadoced CommentTree and Server Proxy, refactored HomeViewController and CommentTree by kyomaru's request
slight change in ServerProxy
 merged main_refactoring, finished javadocing ServerProxy