fixed zero color boldness
fixed merge conflict in trendsd3.js
fixed merge conflict