Fixed some things
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/code/wizard/spell/SpellLevitate.java