Merge remote-tracking branch 'origin/master' into mobile-friendly
Merge branch 'mobile-friendly' of https://github.com/andyhurley/exp-platform into mobile-friendly

Conflicts:
	app/View/Layouts/default.ctp
	app/View/Pages/home.ctp
	app/webroot/css/platform.css