Merge pull request #1 from aindigo/master

added time
rename file
facets regex
add tag
match query
Merge remote-tracking branch 'upstream/master'

Conflicts:
	elasticsearch/src/test/resources/load_data.sh