Dialogue
dia
Merge branch 'master' of https://github.com/cvanherk/rpg

Conflicts:
	.gitignore
	Library/AssetServerCacheV3
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/assetDatabase3
	Library/guidmapper
Revert "Merge branch 'master' of https://github.com/cvanherk/rpg"

This reverts commit 1c6920fc2508e617bd1dfb0dae236859809306d1.