Remove from XML
Merge branch 'master' of https://github.com/fordbill/web.git

Conflicts:
	ps10/WebContent/WEB-INF/web.xml
Merge branch 'master' of https://github.com/fordbill/web.git
remove java libs
Update of web.xml and context.xml
Merge branch 'master' of https://github.com/fordbill/web.git
Fixed Paragraphs and  String in register