各种
Merge branch 'master' of https://github.com/sweety-apps/2golf

Conflicts:
	iOS/shop/view_iPhone/templates/2golf/Common/WeatherViewBoard_iPhone.m
	iOS/shop/view_iPhone/templates/2golf/Common/WeatherViewBoard_iPhone.xib
Merge branch 'master' of https://github.com/sweety-apps/2golf

Conflicts:
	iOS/shop/view_iPhone/templates/2golf/Common/WeatherViewBoard_iPhone.m
	iOS/shop/view_iPhone/templates/2golf/Common/WeatherViewBoard_iPhone.xib