working on seriespicker html/js
Merge remote-tracking branch 'origin/series-api' into series-api

Conflicts:
	server/timeseries/static/timeseries/js/makechart.js