gps
Merge remote-tracking branch 'hermes/master'

Conflicts:
	hermes/hermes-api/src/main/java/com/source3g/hermes/service/LogService.java
ff