init commit
..
Merge branch 'Styling' into InstrumentColors
instrumentColors
Merge branch 'InstrumentColors' into develop0.1

Conflicts:
	js/graphics/CellContainer.js