Minor cleanup
Merge remote-tracking branch 'prglab/master'
Mixing encoder with the UI changes.
Merge remote-tracking branch 'ian/master'

Conflicts:
	closure/src/cryptagram/encoder.js
Merge remote-tracking branch 'ian/master'
Renames for sensitive file systems
Merge remote-tracking branch 'ian/master' into ian
Some code cleanup and comments before connecting main parts of encoder.
Connected the resizer to the encoder.
Fixed incorrect reference to URIHeader