With added HTML form and servlet page examples.
Merge origin/master