Merge "Add new templates & show Statuses in People Tiles" into sc-dev