Merge "Added portal-FE-os project"