merge
Merge branch 'dev' of github.com:shengzhc/iCoffee into dev