Revert "refactoring"

This reverts commit 4d568e6d1e356e934058035360d7b18127a20804.
Merge branch 'master' into clientServer
Merge branch 'master' into clientServer

Conflicts:
	GPSCommentLogger/src/com/CMPUT301W14T13/gpscommentlogger/controller/ClientController.java
	GPSCommentLogger/src/com/CMPUT301W14T13/gpscommentlogger/controller/ClientDispatcher.java
	GPSCommentLogger/src/com/CMPUT301W14T13/gpscommentlogger/controller/ClientListener.java
	GPSCommentLogger/src/com/CMPUT301W14T13/gpscommentlogger/controller/ServerController.java
	GPSCommentLogger/src/com/CMPUT301W14T13/gpscommentlogger/controller/ServerDispatcher.java
	GPSCommentLogger/src/com/CMPUT301W14T13/gpscommentlogger/controller/ServerListener.java