Merge branch 'feature/sort-cpu-usage' into feature/user-roles

Author: Kristan Kenney

web/templates/pages/list_services.html

@@ -22,6 +22,7 @@
           </div>
         </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">
+          <li entity="sort-cpu" sort_as_int="1"><span class="name"><?=_('CPU')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
           <li entity="sort-memory" sort_as_int="1"><span class="name"><?=_('Memory')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
           <li entity="sort-name"><span class="name" id="default-sort"><?=_('Name')?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
         </ul>