added name in settings view
Merge branch 'master' of git://github.com/leviramsey/tumbleweed