Data manager added to ControlLightsViewController
Merge remote-tracking branch 'origin/master'