AWS for login
Merge branch 'develop' into staging