fixed file
Merge branch 'feature/location_detail' into develop