adding templating in opentsdb graphs
fixing unused var
adding counterMax option to opentsdb
fixed identation
added reset value
Merge branch 'opentsdb-counterMax' of github.com:rsimiciuc/grafana into rsimiciuc-opentsdb-counterMax
OpenTSDB: merged PR #930 adding counter max and counter reset options to OpenTSDB query editor
Merge pull request #917 from mchataigner/master

adding templating in opentsdb graphs
ScriptedDashboard: using grafana services in scripted dashboard
Merge branch 'services_in_scripted_dashboard'
ScriptedDashboard: datasource services are now available in scripted dashboards, you can query datasource for metric keys, generate dashboards, and even save them in a scripted dashboard (see scripted_gen_and_save.js for example), Closes #991
CustomDatasource: fixed build optimization issue with custom datasources, Fixes #994
Panel: fix fullscreen/edit view and page refresh when panel is in collapsed/hidden row, Fixes #992
Merge remote-tracking branch 'upstream/master'