Fix issue w/ assigning colors
Merge remote-tracking branch 'origin/beta-1.0' into beta-1.0

Conflicts:
	client/views/schedule/scheduleView.js