Add locations db
Fix locations DB.
resolve conflict
Merge branch 'fix_locations_db'
Merge branch 'master' of https://github.com/esodov/wassermann