Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop

public/stylesheets/new_user.css

@@ -707,7 +707,7 @@ a:hover.gz_btn{ color:#ff5722;}
 .homepagePostReplyjournal{margin-left: 15px; float: left;}
 .lh18 {line-height: 18px;}
 /*该高度会写入配置文件*/
-.maxh360 {max-height: 760px;}
+.maxh360 {max-height: 810px;}
 
 .courseMenu {width:30px; display:block; float:right;height: 50px;}
 .courseMenuIcon {display:inline-block; background:url(../images/homepage_icon2.png) -190px -365px no-repeat; width:15px; height:15px; margin-top: 16px; margin-right: 15px; position: relative;line-height:0;}