Merge branch 'master', remote-tracking branch 'upstream/master'
Halfway finished with prev/next controls.
...
Fixed typo in message.js
added "Message from Mary" header.