io
coollogs
cache
Merge branch 'master' into splunk

Conflicts:
	lib/util/log/log.js
	lib/util/util.js