Merge origin/master into HEAD

Conflicts:
	views/scripts/dean/home.php