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