Merge branch 'develop'

# Conflicts:
#	Application/Home/View/Index/index.html

Application/Home/View/Index/index.html

@@ -32,7 +32,7 @@
   <div class="right pull-right">
     <ul class="inline pull-right">
 	  <if condition="$login_user">
-	    <li ><a href="{:U('Home/Item/index')}">{$Think.lang.help}</a></li>
+	    <li ><a href="{:U('Home/Item/index')}">{$Think.lang.my_item}</a></li>
 	    <else />
 	    <li ><a href="{:U('Home/User/login')}">{$Think.lang.index_login_or_register}</a></li>
 	  </if>