gives an alert when you try to upload a bad formated json dashboard file
Merge pull request #1157 from chocobn69/master

gives an alert when you try to upload a bad formated json dashboard file
Changing the variables from one letter to actual words
Added drag/drop of terms chart in table.
Merge branch 'master' of github.com:elasticsearch/kibana
remove debug console.log
Merge pull request #1174 from rashidkpc/master

Drop facet chart from table onto dashboard
Added multiple value columns for each stat type to the stats panel. Removed value field naming
Include jsonpath
Add stats facet to numeric fields in table
Merge pull request #1176 from rashidkpc/master

Stats panel and stats adhoc facet for table
Add option to tell directive we're dragging an embedded panel, not removing something from a row
Merge branch 'master' of github.com:elasticsearch/kibana
Add drag to resize panel widths. Closes #329
remove commented out less
Merge pull request #1177 from rashidkpc/master

Add drag-to-resize panel widths
Fix for possibility of partial spans
Merge branch 'master' of github.com:elasticsearch/kibana
Simplify kibanaPanel directive, fix css that stopped overflow:scroll from working on the table panel
Merge branch 'master' of https://github.com/elasticsearch/kibana into development

Conflicts:
	src/app/panels/table/module.html