Merge branch 'master' of https://github.com/tongyao/sumeru

Conflicts:
	sumeru/server/DbCollectionHandler.js

Update upload_to_BAE.md