Doing sync for weekend work
Merge branch 'master' of https://github.com/jondutko/Summer2014

Conflicts:
	iterationone/Assets/CharacterGUI.cs
	iterationone/Assets/Icons/bicep.png
	iterationone/Assets/Icons/bicep.png.meta
	iterationone/Assets/Icons/foot.png.meta
	iterationone/Assets/Icons/heart.png
	iterationone/Assets/Icons/magic.png.meta
	iterationone/Assets/Icons/mana.png
	iterationone/Assets/Icons/mana.png.meta
	iterationone/Assets/Icons/resistance.png.meta
	iterationone/Assets/Icons/shield.png
	iterationone/Assets/Icons/shield.png.meta
	iterationone/Assets/Icons/xinzhao.jpg.meta
	iterationone/Assets/character active.png.meta
	iterationone/Library/CurrentLayout.dwlt
	iterationone/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	iterationone/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	iterationone/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	iterationone/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	iterationone/Library/ScriptAssemblies/Assembly-UnityScript.dll
	iterationone/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	iterationone/Library/assetDatabase3
	iterationone/Library/expandedItems
	iterationone/Library/guidmapper
	iterationone/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59