AbilityBar
Merge with master :feelsgood:
Forgot the conflicts :3
Merge remote-tracking branch 'origin/master' into Lag-vinna