charlymierdaseca
Merge branch 'master' of https://github.com/nosoulfilms/escenarios

Conflicts:
	Library/assetDatabase3
	Library/guidmapper
Merge branch 'master' of https://github.com/nosoulfilms/escenarios

Conflicts:
	Library/assetDatabase3
	Library/guidmapper