rydding
Merge remote-tracking branch 'origin/master'

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml
	nbproject/project.properties
	src/java/no/uia/slit/auth/AuthPersistenceService.java
	src/java/no/uia/slit/auth/AuthUser.java
	src/java/no/uia/slit/entity/Student.java
	src/java/no/uia/slit/entity/Teacher.java
	src/java/no/uia/slit/web/JsfUtils.java
	web/WEB-INF/web.xml
	web/admin/user.xhtml
	web/admin/users.xhtml
	web/index.xhtml
	web/resources/css/format.css
	web/student/index.xhtml
	web/teacher/assessment.xhtml
	web/teacher/index.xhtml
	web/teacher/menu.xhtml
	web/teacher/modules.xhtml
	web/teacher/status.xhtml