added nodemailer to package.json - fix #1586
Update settings.json.template
Update settings.json.template
new function for handling custom messages, allows objects to be sent, before we only allowed strings
Merge branch 'develop' of github.com:ether/etherpad-lite into custom-obj-msg
Update version checks
Fix path.join in Settings.js
a safer approach I think but still be careful
(( 2 typos
Merge pull request #1629 from accolade/patch-1

(( 2 typos
hide modal once reconnect is good
 much cleaner way of showing / hiding overlay
Merge pull request #1632 from ether/enable-buttons-reconnect

Enable buttons reconnect
better mobile support for gritter messages, before it was awful
remove console log
Update README.md
Merge pull request #1636 from maixithn/patch-1

Update README.md
beginning of FE tests for caret tracking which is easily broken when you add weird line heights to pads
working caret position function
Localisation updates from http://translatewiki.net.