merge to master
Merge remote-tracking branch 'origin/master' into Branch

Conflicts:
	TrickyNinja/TrickyNinja.userprefs
sdf
EndofDay
nothing new