HttpServlet Tutorial and updates to tutorial template layout
Merge remote-tracking branch 'origin/master'