Checking in code.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Purple Robot
Manager/src/edu/northwestern/cbits/purple_robot_manager/triggers/DateTrigger.java