fix toolbar, pdf formatter
include all measures in drillacross
merge master