Add Location entity
Merge branch 'location-entity' into develop