j
Merge branch 'master' of https://github.com/source3g/hermes.git

Conflicts:
	hermes/hermes-common/src/main/java/com/source3g/hermes/dto/customer/CustomerStatisticsDto.java
	hermes/hermes-common/src/main/java/com/source3g/hermes/dto/message/StatisticObject.java
	hermes/hermes-message/src/main/java/com/source3g/hermes/message/service/MessageService.java