Update
Merge branch 'master' of https://github.com/joester/ICS168Swarch

Conflicts:
	Swarch/Library/assetDatabase3
	Swarch/Library/guidmapper