Added encrypted variables.
Merge branch 'development' into staging