Responsive markup
Merge branch 'django'