Started working on the color editing of cells
Merge remote-tracking branch 'origin/master' into tobias3
Merge remote-tracking branch 'origin/master' into tobias3
Fixed colors and proteins
Merge branch 'tobias3'