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

Conflicts:
	application/controllers/CandidateController.php
	application/controllers/LoginController.php
	library/themes/standard/js/pocket.main.js
pr