* fix bugs: new ui.
Merge branch 'master' of git@github.com:easysoft/zentaopms

Conflicts:

	www/theme/default/style.css