Merge branch 'develop'
1, debug

2, ignore jpg
Merge branch 'hotfix' into develop