report
Merge branch 'master' of https://github.com/AguaiSolutions/vms.git
report
report
Merge branch 'master' of https://github.com/AguaiSolutions/vms

Conflicts:
	Vacation_management_system/Vacation_management_system/Master/VMS.Master
	Vacation_management_system/Vacation_management_system/Web/Dashboard/Dashboard.aspx.designer.cs