Merge branch 'dev' of C:\Users\brain_000\PhpstormProjects\Asterix-CMS with conflicts.
-fix vk oauth