Merge origin/master

Conflicts:
	test/DataSource/TilbudDBTest.java