Merge branch 'master' of github.com:ispiro/cryptogram
Merge branch 'master' of github.com:ispiro/cryptogram
Merge branch 'master' of github.com:ispiro/cryptogram

.
Merge branch 'master' of github.com:prglab/cryptogram

.
Using encoder for demo. Moving file events inside encoder
Merge branch 'master' of github.com:ispiro/cryptogram

.
Encoder handles file loading.
Demo with UI and downloadify
Mixing encoder with the UI changes.
Merge remote-tracking branch 'ian/master'

Conflicts:
	closure/src/cryptagram/encoder.js
codec -> protocols reorganization
Merge remote-tracking branch 'ian/master'
Renames for sensitive file systems