revised join flow round 2
Merge remote-tracking branch 'upstream/20140709-join' into 20140711-employers