Add elasticsearch mapping
# This is a combination of 2 commits.
# The first commit's message is:

Add elasticsearch mapping

# The 2nd commit message will be skipped:

#	update file_stream.php