Commit
Merge branch 'master' of https://github.com/teamzz/RASUS.LectureProject

Conflicts:
	RASUSLab/src/main/webapp/WEB-INF/views/AddUser.jsp
	RASUSLab/src/main/webapp/WEB-INF/views/CategoryChosen.jsp
Logout
Merge branch 'master' of https://github.com/teamzz/RASUS.LectureProject

Conflicts:
	RASUSLab/src/main/webapp/WEB-INF/views/ManageQuiz.jsp