modify CommonAction.class.php
Merge branch 'master' of github.com:workspaces/company

Conflicts:
	www/Lib/Action/CommonAction.class.php
Merge branch 'master' of github.com:workspaces/company
modify doc/任务进度