update
Merge branch 'dev' of github.com:shengzhc/DemoApp into dev