Merge branch 'master' of https://github.com/qhwang1986/cms-web

Conflicts:
	.classpath
	.settings/org.eclipse.core.resources.prefs
	src/main/webapp/views/credit/add.jsp
	target/tomcat/conf/web.xml
	target/tomcat/logs/access_log.2014-01-12
	target/tomcat/work/Tomcat/localhost/cms-web/org/apache/jsp/views/common/ajax_jsp.java
	target/tomcat/work/Tomcat/localhost/cms-web/org/apache/jsp/views/common/frame_jsp.java
	target/tomcat/work/Tomcat/localhost/cms-web/org/apache/jsp/views/common/page_jsp.java
	target/tomcat/work/Tomcat/localhost/cms-web/org/apache/jsp/views/credit/add_jsp.class
	target/tomcat/work/Tomcat/localhost/cms-web/org/apache/jsp/views/credit/add_jsp.java
	target/tomcat/work/Tomcat/localhost/cms-web/org/apache/jsp/views/custmanager/list_jsp.java
	target/tomcat/work/Tomcat/localhost/cms-web/org/apache/jsp/views/custmanager/listtable_jsp.java
	target/tomcat/work/Tomcat/localhost/cms-web/org/apache/jsp/views/customer/add_jsp.java
	target/tomcat/work/Tomcat/localhost/cms-web/org/apache/jsp/views/customer/list_jsp.java
	target/tomcat/work/Tomcat/localhost/cms-web/org/apache/jsp/views/customer/listtable_jsp.java
Merge branch 'master' of https://github.com/qhwang1986/cms-web