Merge origin/coryNew into Franco

Conflicts:
	target/classes/com/uboard/connections/Controller.class
	target/classes/com/uboard/objects/SubAssignment.class
	target/classes/com/uboard/objects/Utilities.class