Merge branch 'testing' into 'devel_varun'
Varun Srivastava authored
# Conflicts:
#   views/DE/account/contact.pug
#   views/DE/account/home.pug
#   views/DE/account/profile.pug
#   views/DE/account/security.pug
#   views/DE/account/services.pug
73489e78