search city
Merge remote-tracking branch 'origin/master' into develop
add yahooservice.coffee
get_weather_data_by_woeid ok
ajax ansyc = true;add trie_inface
add spl
delete
fix bug of yahoo weather api get_woeid_by_place_name
Merge remote-tracking branch 'origin/master' into develop
Merge branch 'develop' of github.com:linuxdeepin/desktop-plugins into develop
update audio_helper/info.ini  y:3
Merge remote-tracking branch 'origin/develop'

Conflicts:
	audio_helper/info.ini
delete sql_inface && trie_inface
Merge branch 'master' into develop
update weather && clock info.ini x y
change if 1 to if 0  for yahooservice
Merge remote-tracking branch 'origin/develop'