locality changes
Merge branch 'master' of https://github.com/roddiedude/hackathon
Merge branch 'master' of https://github.com/roddiedude/hackathon
fixed login for normal user and department user