Merge remote-tracking branch 'origin/V1' into V1

# Conflicts:
#	common/src/main/java/com/jpsoft/smart/modules/base/dao/PersonDeviceFilterLogDAO.java
#	common/src/main/java/com/jpsoft/smart/modules/base/service/PersonDeviceFilterLogService.java

common/src/main/java/com/jpsoft/smart/modules/base/dao/PersonDeviceFilterLogDAO.java

@@ -40,4 +40,6 @@ public interface PersonDeviceFilterLogDAO {
     PersonDeviceFilterLog lastPersonLog(Long personId);
 
     PersonDeviceFilterLog getByPersonIdAndDate(@Param("personId")Long personId,@Param("startDate")String startDate, @Param("endDate")String endDate);
+
+    PersonDeviceFilterLog get(Long id);
 }

common/src/main/java/com/jpsoft/smart/modules/base/service/PersonDeviceFilterLogService.java

@@ -42,4 +42,6 @@ public interface PersonDeviceFilterLogService {
 
     PersonDeviceFilterLog getByPersonIdAndDate(Long personId,String startDate,String endDate);
 
+    PersonDeviceFilterLog get(Long id);
+
 }