Merge branch 'master' into folders
Merge branch 'master' into folders

Revert crypton.js along with master - substitute a local crypton.js copy
for use with your locally server version.
Merge remote-tracking branch 'encryptr/folders' into folders