more setting updates
Merge branch 'master' of https://github.com/Xazak/silent-stars

Conflicts:
	informNotes