Update d3js - area chart and line chart
Merge branch 'develop'