Export to Google Cal
 Please enter the commit message for your changes. Lines starting
Added login style page needs to be integrated into haml
Google Cal test pass
html style,fonts added inside design layout folder
Merge branch 'master' into style-branch-JM
dynamic social urls for club and event

- facebook url added for event
- callink url added for club
dynamically fill index page

TODO: reimplement search front-end
TODO: display people attending
TODO: link to google correctly
TODO: tailor pagination to new front-end
Pagination works for the new UI
Merge branch 'googlecal' into style-branch-JM

Conflicts:
	app/controllers/events_controller.rb
Event name is no longer a link
friend list  work in progress
Export location to google cal
Added bootstrap style to pagination
style friends attending

- use placeholder images until integrated with real images
- display event start time on new line
Merge branch 'feature-friend-list' into style-branch-JM

Conflicts:
	app/controllers/events_controller.rb
	app/models/event.rb
	app/views/events/_list_item.html.haml
add Gemfile.lock for deployment
convert to string when Event.find_by_facebook_id

this problem does not happen for sqlite

but postgres complains:

PG::UndefinedFunction: ERROR:  operator does not exist: character varying = bigint
LINE 1: ...ts".* FROM "events"  WHERE "events"."facebook_id" = 35267328...
                                                             ^
HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
: SELECT  "events".* FROM "events"  WHERE "events"."facebook_id" = 352673288199808 LIMIT 1