Fix empty user model start bug
Fix JS bug in PlanExercise precondition
Merge remote-tracking branch 'origin/develop' into TimeOfDay

Conflicts:
	core/agent/java/edu/wpi/always/resources/Activities.xml
	core/agent/java/edu/wpi/always/user/UserModelBase.java