Merge pull request #117 from eklyman/master

Add Report and Edit modals work
fixes modal close