Merge origin/master

Conflicts:
	editDormitory.php
Merge origin/master
Merge origin/master

Conflicts:
	editDormitory.php
Merge origin/master

Conflicts:
	dormdetail.php