Merge branch 'gh-pages-dev' into gh-pages

Conflicts:
	InsightJS/dist/docs/index.html
	InsightJS/dist/docs/insight.Axis.html
	InsightJS/dist/docs/insight.AxisGridlines.html
	InsightJS/dist/docs/insight.BubbleSeries.html
	InsightJS/dist/docs/insight.Chart.html
	InsightJS/dist/docs/insight.ChartGroup.html
	InsightJS/dist/docs/insight.ColumnSeries.html
	InsightJS/dist/docs/insight.DataSet.html
	InsightJS/dist/docs/insight.Dimension.html
	InsightJS/dist/docs/insight.Formatters.html
	InsightJS/dist/docs/insight.Legend.html
	InsightJS/dist/docs/insight.LightTheme.html
	InsightJS/dist/docs/insight.LineSeries.html
	InsightJS/dist/docs/insight.MarginMeasurer.html
	InsightJS/dist/docs/insight.MarkerSeries.html
	InsightJS/dist/docs/insight.RowSeries.html
	InsightJS/dist/docs/insight.ScatterSeries.html
	InsightJS/dist/docs/insight.Series.html
	InsightJS/dist/docs/insight.Table.html
	InsightJS/dist/docs/insight.Theme.html
	InsightJS/dist/docs/insight.Tooltip.html
	InsightJS/dist/docs/insight.html
	InsightJS/dist/insight.min.js
	examples/barsLines.js
	insight.js.zip
	js/controllers/indexController.js
	js/insightChartsControllers.js