Signed-off-by: xiaoping <xiaoping>
Merge branch 'master' of https://github.com/CRM2014/cf into xiaoping
Merge branch 'xiaoping' of git@github.com:CRM2014/cf.git

Conflicts:
	WebContent/view/common/menu.jsp
	src/cf/crm/action/account/struts-account.xml
	src/cf/crm/action/customer/struts-customer.xml