Merge pull request #2 from Kafedra/master

a
Merge pull request #3 from Kafedra/master

Last fixes
fixed frontend
Merge pull request #6 from Warezovvv/master

fixed frontend