Merge remote-tracking branch 'origin/master'

Conflicts:
	Sport Elec 3/Library/assetDatabase3