- merged different fixes and updates from foreign branches

Marius Burkard

2016-01-04 d22277878254cf33fd63ca1bf12b215f4e030a27

 interface/web/admin/templates/server_config_server_edit.htm

@@ -63,6 +63,12 @@
                    {tmpl_var name='backup_mode'}
                </select></div>
            </div>
         <div class="form-group">
                <label for="backup_time" class="col-sm-3 control-label">{tmpl_var name='backup_time_txt'}</label>
                <div class="col-sm-3"><select name="backup_time" id="backup_time" class="form-control">
                    {tmpl_var name='backup_time'}
                </select></div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='backup_delete_txt'}</label>
                <div class="col-sm-9">