fixed cups in social login
Merge branch 'shaastra_production' of https://github.com/The-WebOps-Club/fest-api into shaastra_production

Conflicts:
	apps/users/views.py