google api
Merge branch 'master' of https://github.com/tnatool/test.git

Conflicts:
	TNAtoolAPI-Webapp/WebContent/Xreport.html
	TNAtoolAPI-Webapp/WebContent/index.html
	TNAtoolAPI-Webapp/WebContent/js/otp/client.js