menu role code refine
Merge branch 'master' of github.com:antme/pms

Conflicts:
	web/js/ui.js
Merge branch 'master' of github.com:antme/pms

Conflicts:
	web/js/ui.js
	web/styles/default.css
code merge
code refine for role