fixed report generation
Merge remote-tracking branch 'origin/master'

Conflicts:
	ChocAn/ChocAn/src/com/chocolate_rain/ui/ManagerTerminalUI.java