add username to welcome message
add username for views
Merge branch 'master' of https://github.com/teamreactive/swap