Merge branch 'master' into release

Application/Home/View/default/Index_index.tpl

@@ -12,6 +12,7 @@
 // body 主题部分
 {:block name="body"}
 
+<div class="page-2143 page1 page"><div class="res-30300 bg"></div><div class="res-30307 logo"></div><div class="res-30303 make"></div><div class="res-30362 username"><input name="username" type="text" /><div class="res-30363 inputTip"></div></div><div class="res-30306 title"></div><div class="res-30308 hide showBox"></div><div class="res-30309 demo"></div><div class="res-30301 hide again"></div><div class="res-30302 hide saveTip"></div></div>
 
 
 {:/block}