Merge branch 'develop' into 00018-Theme_lines_type
task #00018-Theme_lines_type: Form element added
Merge branch '00018-Theme_lines_type' into develop