Reordering dashboard tabs no longer breaks them
Merge remote-tracking branch 'origin/development' into dev