now app is on AWS
Merge branch 'release'