merge commit
Add basic report view
Merge remote-tracking branch 'origin/master'