Merge branch 'social-auth' of E:\PycharmProjects\msp4 with conflicts.
add auth.urls
add auth.urls