Fix for proguard settings
Merge remote-tracking branch 'origin/fullscreen' into fullscreen
Fix for proguard settings