Merge remote-tracking branch 'origin/master'
add back to top js functions
Merge remote-tracking branch 'origin/master'