base omniauth
Merge branch 'develop' into omniauth

Conflicts:
	config/routes.rb
	db/schema.rb
merge develop
test Omniauth VK
test Omniauth FB
add omniauth icons