Merge branch 'master' of C:\PhpstormProjects\datwordapp with conflicts.
Merge branch 'master' of C:\PhpstormProjects\datwordapp with conflicts.