fix sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	Warmyparmy/Warmyparmy.userprefs