facebook login tests completed
add Gemfile.lock for deployment
facebook login tests
Merge branch 'master' of github.com:hongjun1126/calcentral_events_prototype
Merge branch 'facebookLoginTesting' into feature-friend-list

Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.haml
	features/support/env.rb
integration: show events attending

TODO: remove code duplication