Formatted code, optimized imports
Added new APK