Report
Bug Fix.
Employee color bug fix.
Merge remote-tracking branch 'origin/master'
Filter.
Merge remote-tracking branch 'origin/s2' into s2
Merge remote-tracking branch 'origin/master' into s2

Conflicts:
	config/config.properties