Merge remote-tracking branch 'git-svn' of ../../L2j-svn/L2J_DataPack_BETA
Merge branch 'master' of https://github.com/Battlecruiser/L2J_DataPack_BETA

Conflicts:
	dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java