Merge branch 'release/1.5.7' into develop
reverted templates.js
Merge branch 'release/1.5.8' into develop
Merge branch 'develop' of bitbucket.org:dreamfactory/web-csp into develop
Updated tests directory configs to use main
Removed temp directory
Updated composer. Fixed margin/padding issue in launchpad
rp
Merge branch 'release/1.5.9' into develop
merge
WIP
1.5.9 merge