Merge branch 'develop'

# Conflicts:
#	Application/Home/View/Item/show.html
#	Public/js/item/show.js

Application/Home/View/Item/show.html

@@ -161,5 +161,4 @@
 <script src="__PUBLIC__/js/jquery.goup.min.js"></script>
 <script src="__PUBLIC__/js/jquery.hotkeys.js"></script>
 
-
-<script src="__PUBLIC__/js/item/show.js?v=1.12thirdtt&343778899912"></script>
+<script src="__PUBLIC__/js/item/show.js?v=1.2"></script>

Public/js/item/show.js

@@ -74,7 +74,7 @@ $(function(){
     $(".page-edit-link").html('');
     $(".doc-left-newbar").html('');
     $(".iframe_content").css("padding-left","30px");
-    $(".iframe_content").css("max-width",'');
+    $(".iframe_content").css("width",'');
     $(".doc-left .nav-list li a i ").css("margin-left" , '10px');
     $(".search-input-append").css("width","100%");
     $(".search-query-input").css("width","70%");