updated files
updated page
Merge branch 'feature/welcome_page' into develop

* feature/welcome_page:
  updated page
  updated files