Update database setup scripts (datastore needs PostGis)
Merge remote-tracking branch 'origin/master'