First commit from this branch
Changed the manifest to reflect the higher SDK version