revert
Merge branch 'master' of https://github.com/audiobahn404/collaborative

Conflicts:
	persistent.sfs