SelectModes Base Color Properties
Merge remote-tracking branch 'upstream/master'
fixes due to changes in graphene folder structure
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Base/SelectModes/SelectModes.h
	Base/SelectModes/SelectModes.inl