Changed source of project
Merge branch 'master' into develop

Conflicts:
	ExamProjectCMS2014/src/java/admin/AdminServlet.java
	ExamProjectCMS2014/src/java/dk/tordur/secondsemester/webapp/SystemUser.java
	ExamProjectCMS2014/src/java/myfirstservlet/SystemUserHandler.java