Merge origin/master

Conflicts:
	src/dagsverket/system/Methods.java
Merge origin/master