Customizes devise views with user name
Fixes merge conflict
Merge pull request #1 from bajh/master

Adds name to devise new user form