Responsive design with Bootstrap
Merge branch 'develop' into staging