Merge pull request #134 from mhotan/master

Updated Satellites
Merge pull request #135 from mhotan/master

Fixed the compilation errors brought by String.xml