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/java/com/nis/domain/log/NtcMailLog.java

@@ -9,7 +9,15 @@ public class NtcMailLog extends BaseLogEntity<NtcMailLog> {
 	private String mailTo;
 	private String subject;
 	private String emlFile;
+	private String emlKey;
 	
+	
+	public String getEmlKey() {
+		return emlKey;
+	}
+	public void setEmlKey(String emlKey) {
+		this.emlKey = emlKey;
+	}
 	public String getMailProto() {
 		return mailProto;
 	}

src/main/resources/messages/message_en.properties

@@ -1043,6 +1043,7 @@ app_desc=Application Description
 tunnel_code=Tunnel Behavior No
 tunnel_name=Tunnel Behavior Name
 tunnel_desc=Tunnel Behavior Description
+<<<<<<< HEAD
 call_external_procedures_failed=Call external procedures failed
 is_hex=Is HEX
 is_case_insenstive=Is Case-senstive
@@ -1084,6 +1085,9 @@ certificate=Certificate
 app_ssl_config=APP SSL Cert Feature
 
 call_external_procedures_failed=Call external procedures failed
+=======
+call_external_procedures_failed=Call external procedures failedfile_strategy=\u6587\u4ef6\u7b56\u7565
+>>>>>>> branch 'develop' of http://10.0.6.99/gwall/gwall.git
 file_strategy=File Strategy
 file_desc=File Desc
 content_type=Content Type

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>