Core project
Android project
Desktop project
HTML5 project
Fix merge