Merge branch 'convert_to_reseller' into 'master'

Marius Cramer

2014-08-14 c56175b5781ee8a20bebe3015bcbe8ea68b9c8b7

 interface/web/js/scrigo.js.php

@@ -94,7 +94,8 @@
<?php
if($server_config_array['misc']['use_combobox'] == 'y'){
?>
    $('#pageContent').find("select").combobox();
    $('#pageContent').find("select:not(.chosen-select)").combobox();
    $('.chosen-select').chosen({no_results_text: "<?php echo $wb['globalsearch_noresults_text_txt']; ?>", width: '300px'});
<?php
}
?>