Export to Google Cal
 Please enter the commit message for your changes. Lines starting
Google Cal test pass
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
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