Added xCharts scatterplot vis type and demo
Fixed conflicts.