fb connect
Merge branch 'master' of github.com:Novamantic/classified

Conflicts:
	Gemfile.lock
	db/schema.rb