* [update] some updates
Merge branch 'master' of https://github.com/littcai/saap.git

Conflicts:
	saap/saap-web/src/main/java/com/litt/saap/crm/web/CustomerController.java
	saap/saap-web/src/main/webapp/WEB-INF/pages/crm/customer/edit.jsp
	saap/saap-web/src/main/webapp/WEB-INF/pages/crm/customer/show.jsp