Merge branch 'master' into Xander

Conflicts:
	sites/all/themes/ggsblank/css/main.css
	sites/all/themes/ggsblank/ggsblank.info
	sites/all/themes/ggsblank/templates/page.tpl.php