Small changes
Merge branch 'master' of https://github.com/jjmrocha/woody-core

Conflicts:
	src/main/java/net/uiqui/woody/core/util/ParallelTimer.java