commit test
Merge branch 'master' of https://github.com/elmiguel/Snatcher

Conflicts:
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper