add emails to folders and token for auth'
Merge branch 'master' of github.com:hermanos/echoes-android