Last commit !
Merge branch 'master' of https://github.com/ivan88iv/SharedTraveller
Merge branch 'master' of https://github.com/ivan88iv/SharedTraveller

Conflicts:
	STServer/.classpath