Fixed trip emthods inconsistencies.
Added git ignore
Merge branch 'master' of https://github.com/tnatool/test.git

Conflicts:
	TNAtoolAPI-Webapp/.classpath
	TNAtoolAPI-Webapp/src/com/webapp/api/Queries.java