Fixed the shape display error
Merge branch 'master' of https://github.com/tnatool/test.git
Added the TNA Software tool Wiki
Merge branch 'master' of https://github.com/tnatool/test.git

Conflicts:
	TNAtoolAPI-Webapp/WebContent/js/otp/client.js