Swear to christ if it's still broken.
2nd REvision
3rd revision
Holy shit I think this is it.
committing for the sake of committing.
PICK A GOD AND PRAY
Merge branch 'behavior_tree_fix' into Stable_Behaviors

Conflicts:
	Assets/_Prefabs/BossTest.prefab
	Assets/_Scenes/Master.unity
	Assets/_Scripts/SpiderBoss/BehaviorTreesAssets/AoeFieldWeb2.asset
	Assets/_Scripts/SpiderBoss/BehaviorTreesAssets/MegaFlareUnity.asset
	Library/InspectorExpandedItems.asset
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	SourceTreeProjects-csharp.sln
	SourceTreeProjects.sln
Added Indicator arrow. Boss leg shadows are now removed when the legs are disabled.
Minor change to Unity MegaFlare
Prepped for merge
Prepped for merge
Merge branch 'merge_copy' into Stable_Behaviors

Conflicts:
	Assets/_Prefabs/BossTest.prefab
	Assets/_Scenes/Master.unity
	Assets/_Scripts/SpiderBoss/LegScript.cs
	Library/InspectorExpandedItems.asset
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	SourceTreeProjects-csharp.sln
	SourceTreeProjects.sln
I PITY DA FOO WHO DUNT USE THIS BRANCH
Merge remote-tracking branch 'origin/master' into Stable_Behaviors

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Library/InspectorExpandedItems.asset
	Library/assetDatabase3
	Library/guidmapper