Updated .apk with latest merges