Fix for bug #44.
Refactor conjured skill to be added to fusion area instead of scrollable skills menu so conjured skills don't scroll with it.
Refactor fusion related code to fix bugs with inconsistent behavior when fusing/clearin fusion area.
Fixes bug #44.
Refactor conjured skill to be added to fusion area instead of scrollable skills menu so conjured skills don't scroll with it.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Classes/GameLogic/Battle/Skills/ConjureSkills/IceStorm.m
	Classes/GameLogic/Battle/Skills/FusionManager.m
	Classes/GameLogic/Battle/Skills/PlayerSkill.h
	Classes/GameLogic/Battle/Skills/PlayerSkill.m
	Classes/Layers/BattleLayer.m