rp
Merge branch 'release/1.5.7' into develop
reverted templates.js
Merge branch 'develop' of bitbucket.org:dreamfactory/web-csp into develop
merge
WIP
Merge remote-tracking branch 'upstream/master' into release/1.6.10
Merge branch 'release/1.6.10'