TASK
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/dagsverket/database/Database.java
Merge remote-tracking branch 'origin/master'