facebook login tests completed
retreive facebook friends

TODO: get user access token
add Gemfile.lock for deployment
search defaults to events + refactor events query

use ransack for better searching
https://github.com/activerecord-hackery/ransack/wiki/Basic-Searching
add categories to search results
facebook login tests
Merge branch 'master' of github.com:hongjun1126/calcentral_events_prototype
add checkboxes to search by club and category
remove duplicate js files so dropdown works

bootstrap dropdown menu binding were not working because two jQuery
instances were being loaded
display select dropdown on click in search bar

change form action accordingly
club result items style, persist search on reload

use javascript to:
    - make sure search action is persisted on page load
    - make select placeholder text persists
Merge branch 'facebookLoginTesting' into feature-friend-list

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

TODO: remove code duplication
Merge branch 'feature-friend-list'

Conflicts:
	Gemfile