progress2
Merge branch 'master' of https://github.com/ToughGuyMountain/thebrandscape

Conflicts:
	Brandscape/Library/assetDatabase3
	Brandscape/Library/guidmapper