Fixed filesystem saving issue.
Merge branch 'master' into nested-sort

Conflicts:
	assets/js/filesystem.js
Added tolerance for sorting to make it smoother