Prevent location duplication in database
start fixing tests in location spec
Merge remote-tracking branch 'origin/master'