Merge branch 'basic-responsive-styles' into develop
Merge branch 'develop'