Add Home Scaffolding Page
Merge branch 'dev'