Modified version and stopped using ESAPI encoding

ESAPI encoding has a bug as documentedt at
http://code.google.com/p/owasp-esapi-java/issues/detail?id=258