Merge pull request #75 from bgrayless/setup_general_modal

Setup general modal
Merge branch 'master' into task_resume_display