Added user page display, added some additional attributes to the user model

and absorbed the configurable team number for the home page
merged with master