Fixing default settings.
Merge branch 'dev' into dev-db

Conflicts:
	resources/db/schema/data/10-settings.tsv
Merge branch 'dev-db' into dev

Conflicts:
	Changelog
Manually updating versions.