fixing movement.js
Merge branch 'master' of C:\projects\Hacking-Days-2013 with conflicts.
Merge remote-tracking branch 'origin/master'