Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6

# Conflicts:
#	server/views/pages/product/brandModels.html

@@ -109,7 +109,6 @@
 
             <div class="panel-col">
                 <select name="type" id="type" value="[[type]]" disabled="true" tabindex="-1" required="required" title="" class="form-control height40">
-
                     <option value="-1">类型</option>
                     <option value="1">品牌款型</option>
                     <option value="2">品牌系列</option>