imp catcher

fuck off github
Merge branch 'master' of https://github.com/Odel/vscape

Conflicts:
	vscape Server/src/com/rs2/model/content/dialogue/Dialogues.java
	vscape Server/src/com/rs2/model/content/quests/QuestHandler.java