_
Merge branch 'developer' into josh
Added active powerup display to the gui
added player directional facing, melee and aura attack hitboxes