fixing location drop down
moving department location in header
Merge branch 'master' into sprint6
SDPII-177 - changing delete function to disable in departments
Merge branch 'sprint6' of https://github.com/StrataLabs/service_desk into sprint6