encryption.xml support
Merge branch 'master' into beta
compilation issues