add release/4.0 branch to .travis.yml
Merge pull request #2084 from marutosi/finn/release/4.0/travis

add release/4.0 branch to .travis.yml
Revert "we should force ssl  in the app and don’t rely on the webserver’s redirect rules."

This reverts commit b36c1d089eb05679bddd740eca991912421494e4.
Merge pull request #2086 from opf/hotfix/revert_force_ssl

Revert: force ssl in production
fix timeline float behavior

When we clear both, the float of the project menu is also factored in.
Merge pull request #2089 from opf/hotfix/fix_timeline_float
Merge branch 'release/4.0' into dev