non
Merge branch 'master' of https://github.com/codelogicws/Discrete-Observant-File-Sync

Conflicts:
	bin/ws/codelogic/dofs/computer/LocalComputer.class