Merge branch 'master' into talmdal_dev

Conflicts:
	modules/server_add/helpers/server_add_theme.php

1 files changed, 2 insertions, 0 deletions

diff --git a/modules/server_add/helpers/server_add_theme.php b/modules/server_add/helpers/server_add_theme.php
index 9da8969a..e213779c 100644
--- a/modules/server_add/helpers/server_add_theme.php
+++ b/modules/server_add/helpers/server_add_theme.php
@@ -20,6 +20,7 @@
 class server_add_theme_Core {
   static function head($theme) {
     if (identity::active_user()->admin) {
+      $theme->css("server_add.css");
       $theme->script("server_add.js");
     }
   }
@@ -27,6 +28,7 @@ class server_add_theme_Core {
   static function admin_head($theme) {
     $head = array();
     if (strpos(Router::$current_uri, "admin/server_add") !== false) {
+      $theme->css("server_add.css");
       $theme->css("jquery.autocomplete.css");
       $base = url::site("__ARGS__");
       $csrf = access::csrf_token();