Merge employee-directory-1

Major parts of work on the EmployeeDirectory module is done.