Some bug fixes on server
Merge branch 'master' of https://github.com/tnatool/test.git

Conflicts:
	TNAtoolAPI-Webapp/WebContent/index-old.html
	TNAtoolAPI-Webapp/WebContent/js/otp/client-old.js
	TNAtoolAPI-Webapp/src/com/webapp/api/Queries.java