Merge origin/master

Conflicts:
	src/java/controller/Controller3.java
	src/java/entity/Valgfag.java
	src/java/script/Insert.sql