comit
adasda
Merge branch 'master' of github.com:quynhnguyen1202/Enterprise_Manager

Conflicts:
	EnterpriseManagement/src/vn/com/hkt/statistic/chart/EnterpriseStatisticChart.java