update
Merge branch 'master' of https://github.com/apr7/apr7_test

Conflicts:
	apr7_test/.classpath
	apr7_test/WebRoot/WEB-INF/content/example/helloWorld.jsp
	apr7_test/WebRoot/WEB-INF/content/test-success.jsp
	apr7_test/WebRoot/index.jsp
	apr7_test/WebRoot/success.jsp
	apr7_test/res/config/struts/struts.xml
	apr7_test/src/com/apr7/main/action/TestAction.java