fix web
Merge remote-tracking branch 'origin/master'

Conflicts:
	QuanLyTaiSan/Entities/ViTri.cs