changes on get question and question on jsp
changes on get question and question on jsp
Merge branch 'master' of https://github.com/kornsanz/OQ

Conflicts:
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/index.jsp