Merge "Strings for Beta 1" into sc-dev