Merge branch 'develop' into text_library

Conflicts:
	plottable.d.ts
	src/components/axes/timeAxis.ts
	test/components/categoryAxisTests.ts
Merge branch 'text_library' into label_write