modify home view
Merge branch 'feature-1' into develop
Merge branch 'master' into develop
Merge pull request #2 from yukiyan/develop

Develop