More sophisticated traffi light model; added new orange classifier training data.