融合代码，提交到本地

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Conflicts:
	src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
	src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js

src/main/webapp/static/pages/css/dictInfo.css

@@ -2,29 +2,6 @@
 sysDict serviceDict 
 ***/
 
-.search-lable {
-margin-right: 3px;
-margin-left: 5px;
-}
- .itemType {
-	margin-right: 5px;
-} 
- #itemType {
-	margin-right: 5px;
-} 
-.input-medium {
-	margin-left: 8px;
-}
-	.input-medium {
-    width: 155px !important;
-}
-	.Wdate {
-    border: #c2cad8 1px solid;
-    height: 26px;
-}
-
-.dropdown-menu {
-    min-width: 50px;
-}
+