Merge branch 'dev' of github.com:MaxLord/ctrl-vk into dev