Merge branch 'master' of https://github.com/luckicongee/2013.HOUSING

Conflicts:
dev/includes/header.php
dev/includes/sidebar-workshops.php
Merge branch 'master' of https://github.com/luckicongee/2013.HOUSING

Conflicts:
	dev/includes/header.php
	dev/includes/sidebar-workshops.php
workshop
//
Merge branch 'master' of https://github.com/luckicongee/2013.HOUSING

Conflicts:
	dev/contact-staff.php
	dev/includes/header.php
	dev/includes/sidebar-workshops.php