up timeout to 6 mins
Merge branch 'master' of https://github.com/sharelatex/clsi-sharelatex