Merge branch 'master', remote-tracking branch 'origin/master'
Merge branches 'master' and 'dev'
Adds homepage to team model and managing for that. Adds coach as option when editing a user
Adds a few static pages and stoof
Merge branches 'master' and 'dev' into dev