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

Conflicts:
	hermes/hermes-web/src/main/webapp/jsp/admin/system/version.jsp