Adeel
Merge branch 'master' of https://github.com/missuperior/careers

Conflicts:
	controller/hrpanelController.php
	dao/hrDAO.php