Added favourite champs
Added re-ordering of masteries
woops
Fix ARAM queueing
Added rerolling in ARAM
Merge remote-tracking branch 'upstream/master'