removed type: from log lines
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex

Conflicts:
	app/coffee/Features/ThirdPartyDataStore/UpdateMerger.coffee