github hates me, need to sync this.
Merge branch 'master' of https://github.com/Jeebiss/QuestManager

Conflicts:
	src/main/java/net/jeebiss/questmanager/quests/Quest.java