devise and omniauth-facebook authentication capabilities.
devise and omniauth-facebook authentication capabilities.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile
devise and omniauth-facebook authentication capabilities.