xml
settings tab added
resolved file conflicts
Version 2.6
Validation functionality to Employee tab