login, navigation buttons, and logout working
resolved merge conflicts
Merge branch 'masterMaster' of https://github.com/Rialaado/Grupa4 into masterMaster

Conflicts:
	RestJPA/src/main/webapp/sysAdmin.jsp