Backup
Suppress weather at night
Fix Disco isExhausted bug
Backup
Fix JS bug in PlanExercise precondition
Simplify prec
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
Update Disco
Suppress weather at night
Add user model synchronization
Fix empty model bugs
Night mode
Remove test code
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop' into calendar-debug