fixed status meeting deadlock

(except for when the meeting is pushed past 4:45)
Merge remote-tracking branch 'origin/master'

Conflicts:
	Manager.java
Cleaned up comments
Report formatting. Submitting now.