Merge branch 'master' into 'master'

Marius Cramer

2015-01-05 dee987b263b021b990ea4c62cb15be47c6d61fb5

 interface/web/client/client_edit.php

@@ -98,7 +98,7 @@
         $this->dataRecord['limit_client'] = 0;
      } else {
         if($this->dataRecord["reseller"]) {
            $this->dataRecord["limit_client"] = 1;
            $this->dataRecord["limit_client"] = 1; // allow 1 client, template limits will be applied later, if we set -1 it would override template limits
         }
      }