viking
Merge branch 'master' of https://github.com/nkornek/Ragnaroket

Conflicts:
	Ragnaroket/Library/assetDatabase3
	Ragnaroket/Library/guidmapper