fix merge
Cleanup
Fix Sync
Readd .apk
Merge