Home, Services, Contact Us
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	css/global.css
	css/mallorca-basics-alpha-default-normal.css
	css/mallorca-basics-alpha-default.css
	js/behaviors.js
	preprocess/preprocess-page.inc