route to home
route update
Merge branch 'master' into layout