test of probable asset database merge
Merge branch 'master' of https://github.com/SadMonk/10seconds

Conflicts:
	Library/assetDatabase3