Merge branch 'develop' of https://github.com/ScottLogic/insight into jsdocs-constructor

Conflicts:
	src/charts/Series/ColumnSeries.js
	src/charts/Series/RowSeries.js
	src/utils/Scale.js