Merge branch 'master' of C:\Users\vandreev\IdeaProjects\amazon with conflicts.