delete temp_now_text opcaty = 0
Merge remote-tracking branch 'origin/develop'

Conflicts:
	weather/weather.coffee
将img width height 设置为lang无关的定值