login code done
code
code
resolved merge conflicts
login done
changes made for prod and staging web.xml
added for roles and permissions
merged with master