Javascript Reordering
Merge branch 'develop' into it