Merge branch 'master' of https://github.com/declum/niocchi

Conflicts:
	src/main/java/org/niocchi/core/ResourcePool.java
Merge branch 'master' of https://github.com/declum/niocchi