Changes to header and fix to the employee table.
Merge branch 'development'