tiny improvement: animation duration is now set equal to model.time.speed
radius adjusted for screen sizes
Make round default instead of floor
merge
merge with develop and arthur's branch
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