FixSomeErrors And added some Events
Merge branch 'origin/master'

Conflicts:
	src/com/then
jworks/magicbattles/event/InventoryChange.java