Merge pull request #865 from Tendrid/develop

Develop
start to fixing double modal
Merge pull request #866 from ahomatthew/develop

start to fixing double modal
modal success