Merge branch 'master' of https://github.com/drichardson23/mlsiteaug13

Conflicts:
	mysite/code/Policy.php
	themes/ml/templates/Layout/HomePage.ss
fb image
Merge branch 'master' of https://github.com/drichardson23/mlsiteaug13

Conflicts:
	mysite/code/Policy.php