Merge origin/master

Conflicts:
	src/dagsverket/database/Database.java