tiny improvement: animation duration is now set equal to model.time.speed
radius adjusted for screen sizes
added Ebola modified dataset
integration attempt (fails on moving timeslider)
merge
merge with develop and arthur's branch
train hack: data reaching the views, but the gaps in the data make display broken
basic integration done, ugly shortcuts taken for now
Merge remote-tracking branch 'upstream/develop' into feature/ebola-integration
get latest arthur update on rounding options
Merge remote-tracking branch 'upstream/feature/time-formats' into feature/ebola-integration

Conflicts:
	preview_pages/_examples/bubble-chart.html
	src/components/_examples/bubble-chart/bubble-chart.js
	src/tools/_examples/bubble-chart/bubble-chart.js
Merge remote-tracking branch 'upstream/feature/ebola-integration' into feature/ebola-integration

Conflicts:
	data-waffles/ebola_data/en/ebolaMockData-v3.json
	preview_pages/_examples/bubble-chart.html
	src/components/_examples/bubble-chart/bubble-chart.js
	src/tools/_examples/bubble-chart/bubble-chart.js
axes labels added
quick fix for OPTIONS
fixing OPTIONS
fixed a few critical bugs, reduced ugliness of the solution, started doing interpolation
fixing bugs with time scrolling, adding back log scales
Merge remote-tracking branch 'upstream/develop' into feature/ebola-integration

Conflicts:
	src/models/data.js
	src/tools/_examples/bubble-chart/bubble-chart.js
fix bug when some properties are missing
removed transitions on searching the time slider, added blur