Upgrade influxdb
Merge branch 'master' into rickshaw

Conflicts:
	resources/public/index.html