Ignore public/assets
Merge branch 'master' into unify-prod
Updated the default route to /
Merge branch 'master' into unify-prod