数据库更新
1
Merge branch 'branch_20131214' of github.com:xici/microassistant into branch_20131214