Merge achievements-2 branch changes

Need to merge achievements-2 branch changes, including view of employee achievements in the Employee and EmployeeList view controls, also in ViewEmployeeDetails popup control.