Merge remote-tracking branch 'ispc3master/master'

Dominik

2015-01-11 4d29e42f99f7a9b703be4764034d6794464dad26

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