allow strict transport if ssl is on and stop x-frame-options, this might break embedded pads, please test
Grant access, when valid session is available and sessionNoPassword is set
typo
Merge branch 'upstream/develop'
Fix getRevisionChangeset API call making etherpad crash
Merge branch 'master' into develop
Merge pull request #2123 from ether/master

Update README.md
Toolbar: Fix timeslider button

Wouldn't play nice with url params in document.location
fixes #2124
Merge pull request #2126 from ether/fix/toolbar-timeslider-button

Toolbar: Fix timeslider button
Localisation updates from https://translatewiki.net.
Localisation updates from https://translatewiki.net.
Localisation updates from https://translatewiki.net.
fix color
Localisation updates from https://translatewiki.net.
Fix #online_count

Rather dirty, but works.
Merge pull request #2138 from ether/fix-user-icon-color-and-count

Fix showusers button: Show authorcolor and user_count again
abiword shouldnt be used for HTML native documents
working logic for allowing a server side hook to modify the export file name but NOT the extension
docs for new hook
remove eplite add etherpad