sdd
Merge branch 'master' of https://github.com/sachitkesri/EduMore-ERP.git

Conflicts:
	EduMore--ERP/.settings/org.eclipse.wst.common.component