Merge pull request #1 from matana/master

Add commons-lang3 lib to escape html
Merge pull request #1 from spinfo/master

Merge pull request #2 from matana/master