Still working on dialogue

Replacing DialogueBehaviour with DialogueTree and keeping it just for
assigning controls to the player
New asset files

	new file:   modules/Assets/animations/characters/HeadFemaleAsianEast.asset.taml
	new file:   modules/Assets/animations/characters/HeadFemaleAsianNorth.asset.taml
	new file:   modules/Assets/animations/characters/HeadFemaleAsianSouth.asset.taml
	new file:   modules/Assets/animations/characters/HeadFemaleAsianWest.asset.taml
	new file:   modules/Assets/animations/characters/HeadFemaleMaoriEast.asset.taml
	new file:   modules/Assets/animations/characters/HeadFemaleMaoriNorth.asset.taml
	new file:   modules/Assets/animations/characters/HeadFemaleMaoriSouth.asset.taml
	new file:   modules/Assets/animations/characters/HeadFemaleMaoriWest.asset.taml
	new file:   modules/Assets/animations/characters/HeadFemalePIEast.asset.taml
	new file:   modules/Assets/animations/characters/HeadFemalePINorth.asset.taml
	new file:   modules/Assets/animations/characters/HeadFemalePISouth.asset.taml
	new file:   modules/Assets/animations/characters/HeadFemalePIWest.asset.taml
	new file:   modules/Assets/animations/characters/HeadFemalePakehaEast.asset.taml
	new file:   modules/Assets/animations/characters/HeadFemalePakehaNorth.asset.taml
	new file:   modules/Assets/animations/characters/HeadFemalePakehaSouth.asset.taml
	new file:   modules/Assets/animations/characters/HeadFemalePakehaWest.asset.taml
	new file:   modules/Assets/animations/characters/HeadMaleAsianEast.asset.taml
	new file:   modules/Assets/animations/characters/HeadMaleAsianNorth.asset.taml
	new file:   modules/Assets/animations/characters/HeadMaleAsianSouth.asset.taml
	new file:   modules/Assets/animations/characters/HeadMaleAsianWest.asset.taml
	new file:   modules/Assets/animations/characters/HeadMalePIEast.asset.taml
	new file:   modules/Assets/animations/characters/HeadMalePINorth.asset.taml
	new file:   modules/Assets/animations/characters/HeadMalePISouth.asset.taml
	new file:   modules/Assets/animations/characters/HeadMalePIWest.asset.taml
	new file:   modules/Assets/animations/characters/HeadMalePakehaEast.asset.taml
	new file:   modules/Assets/animations/characters/HeadMalePakehaNorth.asset.taml
	new file:   modules/Assets/animations/characters/HeadMalePakehaSouth.asset.taml
	new file:   modules/Assets/animations/characters/HeadMalePakehaWest.asset.taml
	new file:   modules/Assets/animations/characters/LegDressWalkingEast.asset.taml
	new file:   modules/Assets/animations/characters/LegDressWalkingNorth.asset.taml
	new file:   modules/Assets/animations/characters/LegDressWalkingSouth.asset.taml
	new file:   modules/Assets/animations/characters/LegDressWalkingWest.asset.taml
	new file:   modules/Assets/animations/guide/DragonIdleEast.asset.taml
	new file:   modules/Assets/animations/guide/DragonIdleWest.asset.taml
	new file:   modules/Assets/animations/guide/DragonWalkEast.asset.taml
	new file:   modules/Assets/animations/guide/DragonWalkNorth.asset.taml
	new file:   modules/Assets/animations/guide/DragonWalkSouth.asset.taml
	new file:   modules/Assets/animations/guide/DragonWalkWest.asset.taml
	new file:   modules/Assets/animations/guide/FairyIdleEast.asset.taml
	new file:   modules/Assets/animations/guide/FairyIdleNorth.asset.taml
new file:   modules/Assets/animations/guide/FairyIdleSouth.asset.taml
	new file:   modules/Assets/animations/guide/FairyIdleWest.asset.taml
	new file:   modules/Assets/animations/guide/FairyWalkEast.asset.taml
	new file:   modules/Assets/animations/guide/FairyWalkNorth.asset.taml
	new file:   modules/Assets/animations/guide/FairyWalkSouth.asset.taml
	new file:   modules/Assets/animations/guide/FairyWalkWest.asset.taml
	new file:   modules/Assets/animations/guide/KeaIdleEast.asset.taml
	new file:   modules/Assets/animations/guide/KeaIdleNorth.asset.taml
	new file:   modules/Assets/animations/guide/KeaIdleSouth.asset.taml
	new file:   modules/Assets/animations/guide/KeaIdleWest.asset.taml
	new file:   modules/Assets/animations/guide/KeaWalkEast.asset.taml
	new file:   modules/Assets/animations/guide/KeaWalkNorth.asset.taml
	new file:   modules/Assets/animations/guide/KeaWalkSouth.asset.taml
	new file:   modules/Assets/animations/guide/KeaWalkWest.asset.taml
	new file:   modules/Assets/animations/guide/OwlIdleEast.asset.taml
	new file:   modules/Assets/animations/guide/OwlIdleNorth.asset.taml
	new file:   modules/Assets/animations/guide/OwlIdleSouth.asset.taml
	new file:   modules/Assets/animations/guide/OwlIdleWest.asset.taml
	new file:   modules/Assets/animations/guide/OwlWalkEast.asset.taml
	new file:   modules/Assets/animations/guide/OwlWalkNorth.asset.taml
	new file:   modules/Assets/animations/guide/OwlWalkSouth.asset.taml
	new file:   modules/Assets/animations/guide/OwlWalkWest.asset.taml
	new file:   modules/Assets/images/sprites/characters/Fairy.asset.taml
	new file:   modules/Assets/images/sprites/characters/Owl.asset.taml
	new file:   modules/Assets/images/sprites/characters/headEmotions.asset.taml
	new file:   modules/Assets/images/sprites/characters/heademotions1.png
	new file:   modules/Assets/images/sprites/characters/kea.asset.taml
	new file:   modules/Assets/images/tiles/fanstastycliff2.asset.taml
	new file:   modules/Assets/images/tiles/fantasycliff1.asset.taml
	new file:   modules/Assets/images/tiles/fantasycurtains.asset.taml
	new file:   modules/Assets/images/tiles/fantasycurtains.png
	new file:   modules/Assets/images/tiles/fantasyfurniture.asset.taml
	new file:   modules/Assets/images/tiles/fantasyground.asset.taml
	new file:   modules/Assets/images/tiles/fantasyground1.asset.taml
	new file:   modules/Assets/images/tiles/fantasyhouse.asset.taml
	new file:   modules/Assets/images/tiles/fantasyhouseinterior.asset.taml
	new file:   modules/Assets/images/tiles/frames.png
	new file:   modules/Assets/images/tiles/furniture1.png
	new file:   modules/Assets/images/tiles/furniture2.asse.taml
	new file:   modules/Assets/images/tiles/furniture2.png
	new file:   modules/Assets/images/tiles/gates.png
	new file:   modules/Assets/images/tiles/houseextra.asset.taml
	new file:   modules/Assets/images/tiles/museuminterior.png
	new file:   modules/Assets/images/tiles/musuem.png
	new file:   modules/Main/1/activity/dialogue.cs
	new file:   modules/Main/1/activity/dialogueTree.cs
	new file:   modules/Main/1/behaviours/dialogueBehaviour.cs
Won't fucking sync now
Deleting trash
WHAT?
Merge branch 'master' of https://github.com/LucidMage/AlphaRestructured

Conflicts:
	modules/Main/1/gui/InGame.gui.taml
	modules/Main/1/gui/guiprofiles.cs
	modules/Main/1/sprites/characters/character.cs
	modules/Main/1/sprites/characters/guide.cs