Sorting hubs by active
Merge branch 'laura_and_will'
Prevent display_as and display_name from being used when blank
Provisional animations
Merge branch 'laura_and_will'
Basic final version
Merge branch 'laura_and_will'
Patching a minor bug
Animations fix
Fixing one regression