Merge branch 'master' into 'master'

Reports overhaul

Closes #12, #47, #46, #45, #43, #44, #42, #465, #470, #468, #38, #39, #40, #33, #35, #32, #31, #15, and #11

See merge request !223