Merge branch 'master' into 'master'

Marius Cramer

2015-02-18 a0731012e7a4c0c09cdf69b8d2a913e62f9b2a59

 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
         }
      }