Merge branch 'xml'

Conflicts:
	Assets/Editor.meta
	Assets/Editor/Water (Pro Only).meta
	Assets/Scenes/Scene1.unity
	Assets/Scripts/Camera/CameraClippingCorrection.cs
	Assets/Scripts/Camera/CameraClippingCorrection.cs.meta
	Assets/Scripts/Camera/CameraController.cs
	Assets/Scripts/Camera/CameraController.cs.meta
	Assets/Scripts/Camera/IsBackZoomAllowed.cs
	Assets/Scripts/Camera/IsBackZoomAllowed.cs.meta
	Assets/Scripts/CameraController.cs.meta
	Assets/Scripts/IsBackZoomAllowed.cs.meta
	Assets/Scripts/Skill.cs.meta
	Assets/Scripts/XMLReader.cs.meta
	Assets/Standard Assets/Particles.meta
	Assets/Standard Assets/Particles/Sources.meta
	Assets/Standard Assets/Physic Materials.meta
	Assets/Standard Assets/Water (Pro Only)/Sources.meta
	Assets/XML.meta
	Library/InspectorExpandedItems.asset
	Project3-csharp.v11.suo
stuff
Merge branch 'origin/feature/xml'

Conflicts:
	Project3-csharp.suo
	Project3.userprefs
Minion reads from Minion.xml
tested version
updates
update xml's and reader
Merge branch 'feature/minion&hero_xml'