Add gama_city_id to branch form fixes #252