All js in one file, moving image for user
Merge branch 'staging'