merging from master
resolve merge conficts
fix merge
add reports
fix styles
Merge pull request #30 from eklyman/master

reports modals