before merge
test for client functions
changed menu for operator
Merge branch 'sergiokiselev-master'
Merge branch 'EugeneShapovalov-master'