update eclipse project settings
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.classpath
	.project

Fix issue with URLEncoderFilter
Merge pull request #2 from ic3fox/master

Fix issue with URLEncoderFilter