plural verbose names for models
Merge remote-tracking branch 'upstream/master'
add dataviz requirements