formatting
EncryptionMethod class moved to zlibrary
Merge branch 'master' into ice-cream-sandwich