- added url-mapping for home and team
Merge origin/master