Merge branch 'feature/edit-places-40' into prototype