added apk upgradeing feature
merged conflicts