transfers demo
Merge branch 'master' of https://github.com/tunacasserole/omni

Conflicts:
	vendor/gems/omni/app/assets/javascripts/omni_desktop/view/transfers/Explorer.js
eou