add nvd3
merge from master