- Branch crazyness
Merge origin/Cory into may

Conflicts:
	target/classes/com/uboard/connections/Controller.class
	target/classes/com/uboard/objects/Assignment.class
	target/classes/com/uboard/objects/Feedback.class
	target/classes/com/uboard/objects/Lesson.class
	target/classes/com/uboard/objects/SubAssignment.class