test
Merge branch 'master' of https://github.com/tongc/goda5

Conflicts:
	hagendaz/common/src/test/java/com/goda5/hagendaz/common/JMockit2Test.java
	hagendaz/common/src/test/java/com/goda5/hagendaz/common/NioWatchService.java