c
Merge branch 'master' of https://github.com/asmoljo/utils-1.git

Conflicts:
	src/main/java/hr/asmoljo/utils/jndi/url/ExternalMessageReader.java