update changelog more
minor cleanup
update zoom control styles, extract general toolbar classes, fix #1209
fix whitespace, update build
Merge remote-tracking branch 'upstream/master'