Server
Merge branch 'Alexey' into Develope
Merge branch 'Develope' into Dmitriy
Fixing bug with menu saving
Merge pull request #6 from vvov91/Dmitriy

Dmitriy
Merge branch 'Develope' into Alexey