[2944] Added sorting to list of employees.
[2944] Change code style.
[2944] Fixed conflicts.
[2944] Fixed conflicts.
[2944] Unitest fixed. No more conflicts.
Merge pull request #9 from add00/bug_2944

[2944] Added sorted list.