edit controller and manager for lines
Merge remote-tracking branch 'origin/develop' into develop