111
Merge branch 'branch_20131214' of https://github.com/xici/microassistant into branch_20131214
update