Merge branch 'master' of http://asamoukin@git.calculate.ru/dev/calculate2/calculate-client
Conflicts: client-profiles/60-default-desktop/.vimrc pym/cl_fill_client.pydevelop
commit
e998abb5f7
Conflicts: client-profiles/60-default-desktop/.vimrc pym/cl_fill_client.pydevelop