activity complete!
Merge branch 'master' of github.com:zhouzhaoping/HiApp