Add the basic structure of a timeslider test
add socketTransportProtocols parameter
removed wrong comment in Settings.js
removed wrong comment in settings.json.template
removed empty line in settings.json.template
console.debug socketTransportProtocols
Add same color in pad and chat for author
Update CONTRIBUTING.md
Update CONTRIBUTING.md
Update CONTRIBUTING.md
Update README.md
Fix #1247, #1201: Don't cache eejs blocks!

Caching eejs blocks led to many unexpected bugs
like having to restart the server after installing new plugins
or the legendary connectingbar.gif issue...
Merge pull request #1268 from ether/fix/eejs-block-caching

Fix #1247, #1201: Don't cache eejs blocks!
Added new strings to translate for js files
merged upstream develop
Merge pull request #1249 from leblanc-simon/develop

Fix author colors in chat
Merge branch 'master' into develop

Conflicts:
	README.md
Refine timeslider test
Merge remote-tracking branch 'upstream/develop' into add-socketio-transport-protocol-parameter
Merge pull request #1227 from ether/tests/add-timeslider-revisions-test

Add a timeslider test