.

.
Merge remote-tracking branch 'origin/master'

Conflicts:
	SLIT/nbproject/build-impl.xml
	SLIT/nbproject/genfiles.properties
	SLIT/nbproject/private/private.xml
	SLIT/nbproject/project.properties
	SLIT/nbproject/project.xml
	SLIT/src/java/no/uia/slit/auth/AuthPersistenceService.java
	SLIT/src/java/no/uia/slit/ejb/AbstractPersister.java
	SLIT/src/java/no/uia/slit/ejb/ModulePersistenceService.java
	SLIT/src/java/no/uia/slit/entity/Module.java
	SLIT/src/java/no/uia/slit/entity/Student.java
	SLIT/src/java/no/uia/slit/entity/Teacher.java
	SLIT/src/java/no/uia/slit/web/JsfUtils.java
	SLIT/src/java/no/uia/slit/web/ModuleBean.java
	SLIT/src/java/no/uia/slit/web/Page.java
	SLIT/web/WEB-INF/web.xml
	SLIT/web/student/assessment.xhtml
	SLIT/web/student/course.xhtml
	SLIT/web/student/index.xhtml
	SLIT/web/student/menu.xhtml
	SLIT/web/teacher/assessment.xhtml
	SLIT/web/teacher/courses.xhtml
	SLIT/web/teacher/createModule.xhtml
	SLIT/web/teacher/index.xhtml
	SLIT/web/teacher/menu.xhtml
	SLIT/web/teacher/modules.xhtml
	SLIT/web/teacher/profile.xhtml