Merge origin/master

Conflicts:
	editDormitory.php