Mẫu import
Merge remote-tracking branch 'origin/master'

Conflicts:
	QuanLyTaiSanGUI/frmHinhAnh.cs
Merge remote-tracking branch 'origin/master'

Conflicts:
	QuanLyTaiSan/Entities/LogSuCoPhong.cs
	QuanLyTaiSanGUI/frmHinhAnh.cs