Merge branch 'dev'
Merge branch 'master' of github.com:alexyip/gitest