fix for duplicate user and update to beach list
Merge branch 'amazon' into mobile