Merge branch 'master' into 'master'

Marius Cramer

2015-10-22 796661c563939605d8c7ba7e01b7ecf62f9cd1cf

 interface/web/vm/templates/openvz_vm_edit.htm

@@ -76,6 +76,9 @@
                </div>
            </div>
            <div class="form-group">
            <label for="bootorder" class="col-sm-3 control-label">{tmpl_var name='bootorder_txt'}</label>
            <div class="col-sm-9"><input type="text" name="bootorder" id="bootorder" value="{tmpl_var name='bootorder'}" class="form-control" /></div></div>
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                <div class="col-sm-9">
                    {tmpl_var name='active'}