fix quản lý phòng + webQLTS
Merge remote-tracking branch 'origin/master'

Conflicts:
	QuanLyTaiSanGUI/QLPhong/MyUserControl/ucQuanLyPhong.Designer.cs
	QuanLyTaiSanGUI/QLPhong/MyUserControl/ucQuanLyPhong.cs
	WebQuanLyTaiSan/XemNhanVien.aspx.cs