latest
Merge branch 'master' of github.com:norikone/TestServlet

Conflicts:
	MoneyCalc/WebContent/META-INF/context.xml
	MoneyCalc/WebContent/WEB-INF/web.xml
	MoneyCalc/build/classes/loginpack/TopPageServlet.class
	MoneyCalc/org/apache/jsp/registerError_jsp.class
	MoneyCalc/org/apache/jsp/registerError_jsp.java
	MoneyCalc/src/loginpack/TopPageServlet.java