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

Conflicts:
	hermes/hermes-merchant/src/main/java/com/source3g/hermes/merchant/api/ElectricMenuApi.java
	hermes/hermes-web/src/main/java/com/source3g/hermes/merchant/controller/AccountController.java