removed sdk versioning from the manifest because it's in the build.gradle file
Merge remote-tracking branch 'origin/master'