Conflicts:
	public/app/plugins/datasource/influxdb/queryCtrl.js

feat(elasticsearch): metric response handling and processsing now supports alias patterns, {{term field name}} and {{metric}} now works, #1034

feat(elasticsearch): extended stats like std deviation now works, and sigma option as well, added unique count (cardinality as well, #1034

feat(elastic_ds): moving time field name to dataasource option, it is no longer specified for each query and date_histogram

feat(elasticsearch): began work on supporting extended stats metric agg, it gives you standard deviation and more

feat(elasticsearch): fields are fetch from mapping instead of docs, you can enter custom value in field options, other fixes, #1034

feat(elasticsearch): worked on percentiles metric aggregator in editor and in elasticsearch response processing

feat(elasticsearch): terms aggregation options are working, things are starting to come together, #1034

feat(elasticsearch): term metric filters are starting to work! like terms aggregation with top 5, order by metric 1 desc, where metric 1 is maybe average of @load

feat(elasticsearch): so much work on new editor, its pretty broken right now, but when it is done it is going to be amazing

feat(influxdb): More alias options, can now use  syntax to reference part of a measurement name (seperated by dots), closes #2599

fix(graph tooltip): fixed graph tooltip when stacking and one series is not stacked (via override), fixes #2670

doc: fix link to basic concepts

feat(elasticsearch): lots of work on elasticsearch metrics processing, handling grouped responses, etc, #1034

feat(elasticsearch): lots of work on elasticsearch metrics processing, handling grouped responses, etc, #1034