Merge branch 'feature/responsive' into develop