Develop

Security updates and testing from angular-app