Adding LocationPedalo and LocationBateaux
Merge remote-tracking branch 'origin/master'