Merge "Add EVENT_COLOR's to Event Entity Iterator"