Resolve merge conflicts from 3.1.5 release

The aq1.0.js needs to be double checked. I just guessed. Should probably
regenerate the minified version.
Update move.html example to 3.1.5