#34 - frontend/backend edit property model fixes
#28 - additional changes
gyms map
fix conflicts