Merge pull request #63 from shizik/angularjs

Employee page improvements
Merge remote-tracking branch 'wcpro/angularjs' into angularjs