fix up the coloring a bit
Merge branch 'master' of github.com:Wyss/Bioscheduler

Conflicts:
	BioScheduler/src/com/wyss/bioscheduler/client/viewer/ConservationColoring.ui.xml
	BioScheduler/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml