Merge branch 'blog'
fix xs responsive
Merge branch 'develop'
Merge branch 'master' into blog