success in making my app international!
Merge branch 'AWS'