add 1235_Life_Line
Merge branch 'feature-1235'