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_ru.properties
	src/main/resources/messages/message_zh_CN.properties
策略分组功能提交

src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java

@@ -0,0 +1,15 @@
+package com.nis.web.dao.basics;
+
+import java.util.List;
+
+
+import com.nis.domain.basics.PolicyGroupInfo;
+import com.nis.web.dao.CrudDao;
+import com.nis.web.dao.MyBatisDao;
+
+@MyBatisDao
+public interface PolicyGroupInfoDao extends CrudDao<PolicyGroupInfo> {
+	List<PolicyGroupInfo> findPolicyGroupInfoList(PolicyGroupInfo policyGroupInfo);
+	PolicyGroupInfo getById(int id);
+	
+}