Refactoring in cms.display.* . Multiple modifications in other packages to account with refactoring.
Merge branch 'dev' of https://github.com/TheOrangeDuke/ClusterManagementSystem into dev