main scene updated with dialogues and fixe on player
Merge branch 'master' of https://github.com/nanarchrist/RPG-ComedyQuest

Conflicts:
	PROTOS/ProtoTibo_v1/ProjectSettings/TagManager.asset