Added encryption to web.config
Merge branch 'test' into dev