Created Sats Activity
Fixed Manifest and String.xml merger conflicts