authorize Facebook/Vkontakte
Merge branch 'master' of https://github.com/epifanov/travel

Conflicts:
	app/models/user.rb