commit server change
Merge branch 'master' of https://github.com/tonglanli/jiebademo

Conflicts:
	jiebademo/lemon_keyword.db
Merge branch 'master' of https://github.com/tonglanli/jiebademo
commit db
db error