Merge origin/master

Conflicts:
	dormdetail.php