refact menu
Merge branch 'master' of https://github.com/paulzhengchina/product.git

Conflicts:
	kanban/src/com/createidea/scrumfriend/struts/action/AdminAction.java
	kanban/src/com/createidea/scrumfriend/utils/email/MailTest.java