Added encrypted files.
Merge branch 'master' into phase4