Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 0b2c4118a0894f722318ae4d861baddb8f66fd4d

 interface/web/sites/templates/web_vhost_domain_advanced.htm

@@ -23,12 +23,16 @@
                <div class="col-sm-9"><input type="text" name="added_by" id="added_by" value="{tmpl_var name='added_by'}" class="form-control" /></div></div>
         <div class="form-group">
                <label for="system_user" class="col-sm-3 control-label">{tmpl_var name='system_user_txt'}</label>
                <p class="value">&nbsp; &nbsp;{tmpl_var name='system_user'}</p>
                <div class="col-sm-9">
                <div class="checkbox">&nbsp; &nbsp;{tmpl_var name='system_user'}</div>
                </div>
                <input name="system_user" id="system_user" value="{tmpl_var name='system_user'}" type="hidden" />
            </div>
            <div class="form-group">
                <label for="system_group" class="col-sm-3 control-label">{tmpl_var name='system_group_txt'}</label>
                <p class="value">&nbsp; &nbsp;{tmpl_var name='system_group'}</p>
                <div class="col-sm-9">
                <div class="checkbox">&nbsp; &nbsp;{tmpl_var name='system_group'}</div>
                </div>
                <input name="system_group" id="system_group" value="{tmpl_var name='system_group'}" type="hidden" />
            </div>
            <div class="form-group apache">