Merge branch 'widget' of github.com:jouyouyun/life_search into widget
Merge branch 'tmp' into widget
change main.coffee Gesture if else to switch when
Merge branch 'widget' of github.com:jouyouyun/life_search into widget

Conflicts:
	resources/LifeSearch/js/main.coffee
make error
clear
Update gitignore
Add JS_EXPORT_API
Merge branch 'widget' into tmp