Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop

src/main/ui/static/payment/partner/templates/apply_sub_merchant_id.html

@@ -70,15 +70,11 @@
                                 </div>
                             </div>
 
-                            <div class="form-group"
-                                 ng-class="{'has-error':subForm.website.$invalid && subForm.website.$dirty}">
-                                <label class="control-label col-sm-3" for="website_input">* Website</label>
+                            <div class="form-group">
+                                <label class="control-label col-sm-3" for="website_input">Website</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.company_website"
-                                           type="url" name="website" id="website_input" required>
-                                    <div ng-messages="subForm.website.$error" ng-if="subForm.website.$dirty">
-                                        <p class="small text-danger" ng-message="required">Required Field</p>
-                                    </div>
+                                           type="url" name="website" id="website_input">
                                 </div>
                             </div>
                             <div class="alert alert-danger" ng-if="errmsg" ng-bind="errmsg"></div>