Fix bad merge on DisplayManager.class.js

For some reason the rebase on this file didn't complete and merge markers were left in.
Add the displays in the correct order
AdminController:listDisplays was not correctly adding displays to the intersection to the weights were being lost.