Signed-off-by: unknown <Administrator@PC201304161236.(none)>
Merge branch 'junz' of git@github.com:App-coder/Optimize.git into junz

Conflicts:
	.settings/org.eclipse.wst.common.component
	WebContent/WEB-INF/classes/com/crm/action/other/CustomviewController.class
	work/org/apache/jsp/module/rend/catepage_jsp.class
	work/org/apache/jsp/module/rend/catepage_jsp.java
Merge branch 'junz' of git@github.com:App-coder/Optimize.git into junz

Conflicts:
	.settings/org.eclipse.wst.common.component
	WebContent/WEB-INF/classes/com/crm/action/other/CustomviewController.class
	work/org/apache/jsp/module/rend/catepage_jsp.class
	work/org/apache/jsp/module/rend/catepage_jsp.java

Signed-off-by: zj <zj@zj.com>