charles 08102014
Merge remote-tracking branch 'origin/master'

Conflicts:
	GestionHoteliere/GestionHoteliere/ClientReservation.xaml.vb