unknown css changes + facebook pixel
undoing facebook to try to avoid conflicts
Merge branch 'development' of http://github.com/ellemot/havenly into development

Conflicts:
	theme2/css/main.css