Merge remote-tracking branch 'origin/Interface'

Conflicts:
	SettingsHandlerInterface/Classes/Settings.cs
Merge commit