update CGI
fixed
Merge branch 'haosun'
Bug fix

Total investment should Includes invest in technology increase…
update spending bug fix
Merge branch 'haosun'

Conflicts:
	api/controllers/report.js
	api/routes.js
Fix capacity calculation (overtime) bug
remove IE8
fixed color
Merge branch 'haosun' of https://github.com/ludwiksh/Marksimos into haosun
Merge branch 'haosun'