原型更新2013/08/22
原型更新2013/08/22
Merge branch 'master' of https://github.com/xici/microassistant