Fix bug when purging the series
Fix bug when purging the series
Merge branch 'origin/master'

Conflicts:
	public/js/charts.js
	public/js/synchroCharts.js
	server.js
Merge branch 'heroku/master'
Fix merge error