Revisions:
Ranking
Promotions
Merge branch 'master' of https://github.com/redlinx/hr_recordsystem

Conflicts:
	application/controllers/ranking_committee.php