Working on color coding by categorical variables.
Merge branch 'master' into parameter-image-model
Merge branch 'master' into parameter-image-model
Setting sort order on categorical column data.
formatting
Merge branch 'master' into parameter-image-model
Merge branch 'master' into parameter-image-model

Conflicts:
	web-server/templates/project.html
Disabling using string column for color coding.