fixed stuff
Merge branch 'master' of https://github.com/mjw323/LostCloudSource

Conflicts:
	Library/assetDatabase3