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

Conflicts:
	hermes/hermes-api-common/src/main/java/com/source3g/hermes/service/JmsService.java