Export to Google Cal
 Please enter the commit message for your changes. Lines starting
Google Cal test pass
Merge branch 'googlecal' into style-branch-JM

Conflicts:
	app/controllers/events_controller.rb
Event name is no longer a link