launch dispute in modal
Merge branch 'master' of https://github.com/JonZach/gp_v2 into zach