commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	tn.esprit.teatchingHourlyCalculationWeb/WebContent/pages/SendMail.xhtml