f
Merge branch 'master' of github.com:suntreestar/struts1_core_test

Conflicts:
	src/main/java/com/jsun/test/filter/MyFilter.java