Move locations to other database so it doesn't keep getting overwritten
Merge branch 'master' into toronto