updated schema
update to encrypt keys
Merge branch 'master' into staging