Merge remote-tracking branch 'origin/master' into widget

Conflicts:
	resources/LifeSearch/js/main.coffee
	resources/LifeSearch/plugin/wsearch/wsearch.html
Merge branch 'widget' of github.com:jouyouyun/life_search into widget
update wsearch css and msearch css ok with liuling
Merge branch 'widget' of github.com:jouyouyun/life_search into widget

Conflicts:
	resources/LifeSearch/js/main.coffee
modify panel
Merge branch 'origin/widget'
weather pic
update weather img
fix bug of the msearch load img onerror
朗读时喇叭的动态效果
Modify weather img
msearch img load from img/movie_1.jpg
Merge branch 'widget' of github.com:jouyouyun/life_search into widget
fix bug of wsearch when the cityname is too long , the margin is 10px stablable