Fix #1519: don't error in listSessionsOfGroup when there are non-existing sessions (by eldiddio)
works but hides caret on full line and not on X too, X is much harder to do
Update package.json

updated the underscore version number to 1.5.1 (from 1.3.1). Not lifted to most current version because frontend tests broke from 1.5.2 upwards.
Support to allow for a setting so you can stop unknown file types from being imported
tidy up template a bit
tidy up template a bit
tidy up template a bit
tidy up template a bit
Fix position of import/export popup in timeslider
Fix timeslider revision not changing in most cases
Fix click on timeslider loads two different revisions
Merge tag '1.4.1' into develop

1.4.1
Merge pull request #2220 from Gared/timeslider_improvements

Timeslider improvements
Revert change on position of imp/exp overlay
Merge pull request #2232 from ether/master

Merge branch 'release/1.4.1'
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
readme: Add formatting sugar for readibility

* Added a bit more formatting for UNIX-like systems dependencies installation.
Merge pull request #2243 from mrshu/patch-1

readme: Add formatting sugar for readibility
Add support for npm 2
Merge pull request #2249 from Gared/support_npm2

Add support for npm 2