dont die on bad html but only warn to api logger but dont tell client that it failed cause html was bad
include the callback call, for sanity and stop the pad from being nuked so early in the function
docs for setHTML
drunk comments
when exporting HTML include html and body
Merge pull request #1746 from ether/develop

Bring in latest fixes.  No flow included, too much headache.
Merge pull request #1747 from ether/develop

Stop latest Express breaking things
Update SocketIORouter.js

Changed the setting of client.remoteAddress
updated to use settings

updated handler/SocketIORouter.js to use new setting
updated hooks/express.js to use new setting
updated utils/Settings.js to accept new setting
updated settings.json.template so new setting is present
Use rev-parse to get short commit hash

Also ensures unique
export sessioninfos so plugins can access it

allows plugins to map client.id to author id
Merge branch 'release/1.2.11'
Update README.md
Update en.sjon translation

pad.importExport.abiword.innerHTML
Localisation updates from http://translatewiki.net.
Update html10n.js
Make use of the new plural macro
Merge pull request #1841 from ether/update/html10n.js

Update html10n.js
Merge pull request #1816 from bit/sessioninfos

export sessioninfos
Localisation updates from http://translatewiki.net.