gritfs相关
Merge remote-tracking branch 'origin/master'

Conflicts:
	apis/file.js
	controllers/ctrl_file.js