Merge remote-tracking branch 'sebj/master' and tidied up merged code

Marius Cramer

2013-11-18 015dffdc589b396d72092583cc526674f0a9a8d5

 interface/web/dns/templates/dns_wizard.htm

@@ -28,6 +28,17 @@
                        {tmpl_var name='client_group_id'}
                    </select>
                </div>
            <tmpl_else>
                <tmpl_if name="only_one_server">
                    <input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" />
                <tmpl_else>
                    <div class="ctrlHolder">
                        <label for="server_id">{tmpl_var name='server_id_txt'}</label>
                        <select name="server_id" id="server_id" class="selectInput">
                            {tmpl_var name='server_id'}
                        </select>
                    </div>
                </tmpl_if>
            </tmpl_if>
            <tmpl_if name="is_reseller">
                <div class="ctrlHolder">