update bang dien
Merge branch 'master' of https://github.com/caothu159/ECOF

Conflicts:
	ECOFApp/MainForm.designer.cs
	ECOFApp/Model/Management.cs