pr
pr
Merge branch 'master' of https://github.com/andybui2014/PocketRecuiter

Conflicts:
	application/controllers/CompanyprofileController.php
	library/PR/Api/Core/ClientClass.php