initial commit for setting up the ability for bars to expand
Merge branch 'master' into feature/add_bar_chart_options
adding ability for vertical bar chart to expand to 100% and group data (bars). Also starting to log the error.stack instead of only the error.message in vis.js
Merge branch 'master' into feature/add_bar_chart_options
changing percentage/grouped/stacked api
fixing potential bug in the Data constructor
adding min-width for grouped bars, container is too small error gets thrown when bar widths are less than 1px
adding percentage and actual values to tooltip for percent bar charts
Merge branch 'master' into feature/add_bar_chart_options
[vislib/data] handle pies without data
[server] stop blocking cross-origin iframes
Merge branch 'master' into feature/add_bar_chart_options

Conflicts:
	src/kibana/components/vislib/lib/data.js
	src/kibana/components/vislib/lib/y_axis.js
	src/kibana/components/vislib/visualizations/column_chart.js
Merge branch 'master' into allow_cross_origin_iframe

Conflicts:
	src/server/lib/app.rb

	renamed:    src/kibana/apps/discover/controllers/discover.js -> src/kibana/plugins/discover/controllers/discover.js
Merge pull request #1712 from spenceralger/empty_pie_data

[vislib/data] handle pies without data
Merge pull request #1717 from spenceralger/allow_cross_origin_iframe

[server] stop blocking cross-origin iframes
Merge branch 'master' into feature/add_bar_chart_options

Conflicts:
	src/kibana/components/vislib/lib/data.js
	src/kibana/components/vislib/lib/y_axis.js
Merge pull request #1659 from stormpython/feature/add_bar_chart_options

Vislib: Percentage Bar Charts and Grouped Bar Charts