Confirm clear db dialog
merge branche master into location