Merge branch 'developer'
Merge branch 'master' of https://github.com/lanryZhang/MyFramework