addung username to user model. Users can login using username or email address
Merge branch 'master' of github.com:ChooChooo/I-want-an-iPad