Tilføjelse af DB-streng
Merge remote-tracking branch 'origin/master'

Conflicts:
	JTM/Site.master