made 7 day free trial the default
added ga logging of starting free trial again
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex