Merge branch 'master' of C:\Users\whatever\Documents\GitHub\diplom with conflicts.
Views customization(log in page + news page + courses page + course-parts page)