06/03
Merge branch 'Ambroise'

Conflicts:
	Bottle
Booking.xcodeproj/project.xcworkspace/xcuserdata/ambroisecollon.xcuserda
tad/UserInterfaceState.xcuserstate