Auth via vk, fb, tw. Complete!
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/api/users/views.py
	requirements.txt