Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
something added
Merge branch 'master' of https://github.com/seagochen/demo into develop
prototype v1.2 but contains some error