Fix gulp AWS production values
Merge branch 'dev'