Fixed conflicts
added add asset temp version
final for today
final for today
added close modal after creating an asset
added form validations for new employees
 added adress form validation
add code to edit employee
add employee-edit template
merged from alexjs awesome changes