Merge origin/master

Conflicts:
	src/smartravel/util/Connexion.java