splunk
Merge branch 'master' into splunk

Conflicts:
	lib/util/log/log.js
	lib/util/util.js
fn
version
splunk
pull
use-console
filter
event-collector
Merge pull request #10 from LiveTex/splunk

Splunk