added an example of merge between streams and a naive integration with ElasticSearch
merged, fixed conflicts, optimised imports
Merge branch 'master' of https://github.com/eshioji/trident-tutorial