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;
 	}