Switch to original cancan branch
Added WelcomeController for root route

Update views to reflect the change
Use User#username wherever makes sense
Merge remote-tracking branch 'origin/master' into staging