Close that scipt tag
Merge branch 'develop' into staging