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

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_zh_CN.properties

src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp

@@ -168,6 +168,7 @@
 								<th><spring:message code="mail_to"/></th>
 								<th><spring:message code="subject"/></th>
 								<th><spring:message code="eml_file"/></th>
+								<th><spring:message code="eml_key"/></th>
 								
 								<th><spring:message code="clj_ip"/></th>
 								<th><spring:message code="protocol"/></th>