new classpath. no idea what it means
some changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	WebContent/WEB-INF/web.xml
	src/com/lisilab/dictionary/PartOfSpeech.java