Updated code to use JSP for view

Details:

- Added JSP as view layer 

- Changed "query.html" to "index.html"
Merge branch 'master' of https://github.com/jgbarcos/WebEng2014