Updated JOYRIDE with new steps.
Updated conferences-asco-gi2013 page
Joyride. Fixed appearance for phone
Merge commit 'a5043ef9ed70adba6cb146c516e9e8f757a2d65c'

Conflicts:
	assets/css/app.css
	update.html