added userName to Settings
Merge branch 'master' of https://github.com/UniCopa/CopaApp