Made some changes

But I forgot what I made
Merge branch 'master' of https://github.com/noahzark/XXGameHelper

Conflicts:
	src/xxgamehelper/framework/control/messenger/Messenger.java
	src/xxgamehelper/framework/control/messenger/MessengerData.java