fixmail2
Merge branch 'master' of https://github.com/Hack-a-Trip/Hack-a-Trip.git

Conflicts:
	Hack-a-Trip/src/net/tncy/hackatrip/InvitationMail.java
Merge branch 'master' of https://github.com/Hack-a-Trip/Hack-a-Trip.git
Merge branch 'master' of https://github.com/Hack-a-Trip/Hack-a-Trip.git
Merge branch 'master' of https://github.com/Hack-a-Trip/Hack-a-Trip.git
chat alors
Merge branch 'master' of https://github.com/Hack-a-Trip/Hack-a-Trip.git