resyncing out of changes between local ubuntu and aws ubuntu
sync up master with develop