Merge branch 'master' of github.com:gorailsgo/dropRTCyo
Merge branch 'master' of github.com:gorailsgo/dropRTCyo
Merge branch 'master' of github.com:gorailsgo/dropRTCyo
Changed updateProgress to measure fraction of files sent.
Merge branch 'master' of github.com:gorailsgo/dropRTCyo

Conflicts:
	client/app/file_reader_adapter.coffee
	client/app/gui.coffee
Switched back to pseudo load.
Merge branch 'master' of github.com:gorailsgo/dropRTCyo