Fix comment box
Merge branch 'test-social-box'

Conflicts:
	beach.html
	city.html
	files/css/css_791YXBaKKm1ORM_7huSKEsIV9tSWq6wmRkERhuXpN6w.css
	files/js/js_N9Copiq0eEtAx-vj-zSkvghWYCxYP6Wnq3FRnLkXYXs.js
	files/js/js_eQmWE0ZxUnalVC5mxs_UERbhUpykkeaJIVfZKby7AUg.js