Merging aws and master branches to create production version