Merge branch 'lingjun'
Merge branch 'lingjun'
Merge branch 'lingjun'
Merge branch 'lingjun'
Added rough employee detail page.
Merge branch 'master' into lingjun