-- fix for CRM-13129
-- CRM-13129 improvement
Merge branch 'CRM-13129' of git://github.com/ravishnair/civihr into ravishnair-CRM-13129

Conflicts:
	hrstaffdir/hrstaffdir.php
CRM-13129 - hrstaffdir - Partial fix

Activate staffdir enhancements if *last* seen GID was staffdir. The old
beahvior would activate staffdir enhancements if the staffdir GID was *ever*
seen.