Merge branch 'responsive'

Conflicts:
css/caerus.css
js/lightboxes.js