up

update
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ExileHUD/BooleanButton.cs
	src/ExileHUD/Settings.cs