Merge branch 'dev_shcool' into develop

app/views/layouts/new_base_user_show.html.erb

@@ -147,7 +147,7 @@
           </ul>
         </div>
         <div id="watch_user_btn_div">
-          <a href="javascript:void(0);" class="user_editinfo" disabled="true">编辑个人资料</a>
+          <%= link_to "编辑个人资料", my_account_path(:tip => 1), :class => "user_editinfo"%>
         </div>
       </div>
 

app/views/memos/show.html.erb

@@ -90,7 +90,7 @@
       </div>
       <div class="homepagePostReplyDes">
         <div class="homepagePostReplyPublisher"><a href="<%=user_path(reply.author)%>" class="newsBlue mr10 f14"><%= reply.author.name%></a><%=  format_date(reply.created_at) %></div>
-        <div class="homepagePostReplyContent" id="activity_description_<%= reply.id %>"><%= h reply.content.html_safe%></div>
+        <div class="homepagePostReplyContent break_word"  id="activity_description_<%= reply.id %>"><%= h reply.content.html_safe%></div>
       </div>
       <script type="text/javascript">
           $(function(){