Employee/Manager code.
Merge remote-tracking branch 'upstream/master'