Removed employee search
Turned on locale validation
Resolved conflict
Merge branch 'master' into skill_lang