converted to angular
resyncing out of changes between local ubuntu and aws ubuntu
sync up master with develop
Merge branch 'staging'