Merge branch 'master' of github.com:Shaka13/Aloha13

Signed-off-by: Shaka13 <admin@novocms.ru>
Merge branch 'master' of github.com:Shaka13/Aloha13