updated js dir loading afert upload complete
Merge branch 'develop' into stage