removed modal property for popUp, for testing
Merge branch 'mybranch' into develop