open #304 Added classes string and related classes to ClockIndicator;
open #336
open155 open186 Trying a third time to resolve conflicts between open155 and master;