xx
Merge branch 'master' of https://github.com/ascilograf/GitHubTesting

Conflicts:
	Library/assetDatabase3