Merge branch 'widget' of github.com:jouyouyun/life_search into widget
gestures update
Merge branch 'widget' of github.com:jouyouyun/life_search into widget

Conflicts:
	resources/LifeSearch/js/main.coffee