Merge branch 'responsive' into develop