added nodemailer to package.json - fix #1586
Update settings.json.template
Update settings.json.template
Merge branch 'release/1.2.81'
new function for handling custom messages, allows objects to be sent, before we only allowed strings
redirect /admin to /admin/ so that the relative links work
Merge branch 'develop' of github.com:ether/etherpad-lite into custom-obj-msg
Merge pull request #1615 from ether/fix/admin-relative-links

redirect /admin to /admin/ so that the relative links work
fix tests in firefox as firefox fires on keypress not down
This isn't ideal, basically some browsers interact with keypress/keydown in different ways so this is a workaround but it's not perma
missed an evt
 now IE friendly
this should pass more tests..
fix undo test
Merge pull request #1616 from ether/ff-key-tests

fix tests in firefox as firefox fires on keypress not down
escape .color
Merge pull request #1617 from ether/replace-html-with-text

escape .color
remove pointless +
specialkey doesnt even exist afaik
return text instead of html