Merge branch 'master' of https://github.com/L2J/L2J_DataPack_BETA into svn

Conflicts:
	dist/game/data/scripts/handlers/effecthandlers/BlockAction.java
	dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java
	dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java
	dist/game/data/scripts/handlers/effecthandlers/Confuse.java
	dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java
	dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java
	dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java
	dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
	dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java
	dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java
	dist/game/data/scripts/handlers/effecthandlers/GiveSp.java
	dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java
	dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java
	dist/game/data/scripts/handlers/effecthandlers/Pumping.java
	dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java
	dist/game/data/scripts/handlers/effecthandlers/Reeling.java
	dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java
	dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java
	dist/game/data/scripts/handlers/effecthandlers/Resurrection.java
	dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java
	dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java
	dist/game/data/scripts/handlers/effecthandlers/Summon.java
	dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java
	dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java
	dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java
	dist/game/data/scripts/handlers/effecthandlers/TransferHate.java
	dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java
	dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java
	dist/game/data/scripts/handlers/effecthandlers/Unsummon.java
	dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java
	dist/game/data/scripts/quests/SagasScripts/SagasSuperClass.java
Merge branch 'svn' of https://github.com/Battlecruiser/L2J_DataPack_BETA