update settings
Merge branch 'master' of https://github.com/foriacus/stars

Conflicts:
	config/base.yaml