…illing

…nels inside column panel, updated default panels with panel titles

… when no indices match

* upstream/master:
  Moved jshintignore to task so that baseDir could be specified
  Add baseDir variable
  Update loadConfig to allow duplicates
  Modularize grunt tasks
  Fix an issue preventing loading dashboards from subfolders.
  Upgrade elasticjs
  closes #675
  Tweaked pulldown editor path
  allow loading of panels and dashboards from subfolders
  upgrade elastic.js to v1.1.1
  Added scale-to-seconds transformation
  Fixed missing idQueue when using scripted dashboards
  CSS updates
  Fixed lack of refresh on dashboards that do not use a pattern
  Fixed setting default query color from scripted dashboards
  Closes #17
  Closes #653.
  Closes #600
  shorter timespan tooltip
  fixes #628
  Added cache-busting token for loading elasticsearch dashboards
  Added sparklines panel
  fix for markers in modes other than count
  Removed debugging code
  Fix for overflowing modals
  Update README.md
  readme update
  Markers in histogram
  do not show empty load/save dropdowns
  consistent top and bottom margins
  Fixed missing default mandate on filters
  added a 1 minute timeout to require.js.
  histogram: option to set point radius
  updated version
  Added ability to add custom query string filters
  Fix for #609
  remove execute bit re: @shatlovsky
  Fix unpinned queries re: @yahiko
  Query deactivation
  Added disabling of counts, configurable min/max, and display of query in legend
  A few performance improvements for events with a large number of fields
  Added derivative option and scale option to histogram, reorganized histogram config
  added a refresh button if not in auto refresh
  Deprecated derivequeries
  Implemented topN query type, refactored querySrv
  Implemented topN query type, refactored querySrv
  Added year/y to date math parser
  Adding derived type query
  Fix problem with node v0.10.18 and grunt-contrib
  added release task to gruntfile
  Updated version
  Added color stepping functions
  Added color stepping functions
  closes #515
  improved space efficiently of micropanel
  Added elasticsearch _ fields to table, eg _id, _index, _type
  removed non-functional 'change option'
  Match and apply LocationMatch rules
  Updated version
  Added small logo with version on hover
  Sort fields in list correctly
  Added type-to-filter input to field list on table
  Add switch to change field list between current and all
  Add /_nodes route to example reverse proxy config
  Refactored panel errors so they don't cover the panel buttons
  closes #570
  derive stub
  skeleton for default flot pairs
  Prevent selection of first item in typeahead list
  added regular expression queries and esVersion service+directive+filter to allow a given element to require a specified elasticsearch version
  Added 'more' button to related fields section for users with large field counts
  changed file to export
  Fixed tooltip interfering with save button, fixed button alignment
  fixed reroute when clicking 'advanced' think
  Added pie and table options to adhoc terms facet from table micro-panel
  added terms facet button to table micropanel
  Only show timepicker settings if the timepicker is enabled
  Exempt panels that are used in pulldowns or the nav
  Renamed new time picker, deprecated old one
  Added pulldowns for query and filter. Added filter notifications, moved timepicker to navbar, reimplemented auto refresh
  fix for showDropDown method
  New timepicker, collapsable query and filter sections
  aggregated input faking
  tick size auto scale
  Upgraded to angular 1.1.5, refactored filter refreshing, changed panels to destroy scope on hide
  Added new popover positioning
  Fix for colspan issue in firefox. closes #526
  Added route change when saving to elasticsearch or browser default
  Added warning to overloaded rows
  Set placeholder for es save to dashboard title by default, add notice when no indices match
  Fixed some typos and grammar in the README file
  Refactored drag/drop, moved header buttons around, disable drag on panels inside column panel, updated default panels with panel titles
  drag and drop panels, lots of visual tweaks
  drag and drop panels, lots of visual tweaks
  fixed an issue with the interval walker, which was causing bad zero-filling

Conflicts:
	Gruntfile.js
	src/app/controllers/all.js
	src/app/controllers/dash.js
	src/app/dashboards/guided.json
	src/app/dashboards/logstash.js
	src/app/dashboards/logstash.json
	src/app/dashboards/noted.json
	src/app/directives/kibanaPanel.js
	src/app/panels/histogram/editor.html
	src/app/panels/timepicker/module.html
	src/app/partials/dashLoader.html
	src/app/partials/dashboard.html
	src/app/services/all.js
	src/app/services/dashboard.js
	src/app/services/panelMove.js
	src/css/bootstrap.dark.min.css
	src/css/bootstrap.light.min.css
	src/index.html
	src/vendor/bootstrap/less/overrides.less
	src/vendor/jquery/jquery-ui-1.10.3.js