Pulling in Jacob's Code
Merge branch 'Refactoring' of https://github.com/jackbatzner/COEN-4720-Android into Refactoring

Conflicts:
	Ramrod Navigation/src/com/coen4720/ramrod/navigation/ClientThread.java
	Ramrod
Navigation/src/com/coen4720/ramrod/navigation/ControllerFragment.java