Fixed the gui bug
Fixed pathing
Updated files
Philip stuff
Merge branch 'master' of https://github.com/jannickj/cruel-nemesis

Conflicts:
	Cruel/Cruel/GameLogic/SpellSystem/AbilityManager.cs
	UnityTestGame/Assets/dlls/Cruel.dll
	UnityTestGame/Assets/dlls/JSLibrary.xml
	UnityTestGame/Assets/dlls/XmasEngineModel.xml