Merge branch 'master' of https://github.com/297179121/FManager.git

Conflicts:
	index.js
Merge branch 'master' of https://github.com/297179121/FManager.git