fix login scenario and change header.jsp & footer.jsp
- change color of active color in navbar
Merge branch 'master' of github.com:augHarem/HRAugmentis

Conflicts:
	src/main/webapp/css/custom.css