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

Conflicts:
	java/com/l2jserver/gameserver/GameServer.java
	java/com/l2jserver/gameserver/RecipeController.java
	java/com/l2jserver/gameserver/SevenSigns.java
	java/com/l2jserver/gameserver/datatables/SkillData.java
	java/com/l2jserver/gameserver/datatables/SkillTreesData.java
	java/com/l2jserver/gameserver/engines/DocumentBase.java
	java/com/l2jserver/gameserver/instancemanager/FortSiegeManager.java
	java/com/l2jserver/gameserver/model/CursedWeapon.java
	java/com/l2jserver/gameserver/model/actor/L2Character.java
	java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
	java/com/l2jserver/gameserver/model/actor/instance/L2WeddingManagerInstance.java
	java/com/l2jserver/gameserver/model/entity/FortSiege.java
	java/com/l2jserver/gameserver/model/skills/Skill.java
	java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java
	java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java
	java/com/l2jserver/gameserver/network/clientpackets/RequestCrystallizeItem.java
	java/com/l2jserver/gameserver/network/clientpackets/RequestEnchantItem.java
	java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillInfo.java
	java/com/l2jserver/gameserver/util/Evolve.java
Merge branch 'svn' of https://github.com/Battlecruiser/L2J_Server_BETA

Conflicts:
	java/com/l2jserver/gameserver/datatables/SkillData.java
	java/com/l2jserver/gameserver/util/Evolve.java