diff --git a/core/src/cz/nic/tablexia/screen/ScreenDefinition.java.orig b/core/src/cz/nic/tablexia/screen/ScreenDefinition.java.orig
deleted file mode 100644
index 6f12f2233c0987b218c4cf1b188ccf6795270f17..0000000000000000000000000000000000000000
--- a/core/src/cz/nic/tablexia/screen/ScreenDefinition.java.orig
+++ /dev/null
@@ -1,112 +0,0 @@
-package cz.nic.tablexia.screen;
-
-import net.engio.mbassy.listener.Handler;
-
-import cz.nic.tablexia.Tablexia.ChangeScreenEvent;
-import cz.nic.tablexia.TablexiaApplication.ScreenTransaction;
-import cz.nic.tablexia.bus.ApplicationBus;
-import cz.nic.tablexia.menu.MainMenuDefinition;
-import cz.nic.tablexia.screen.about.AboutScreen;
-import cz.nic.tablexia.screen.encyclopedia.EncyclopediaScreen;
-import cz.nic.tablexia.screen.gamemenu.GameMenuScreen;
-import cz.nic.tablexia.screen.halloffame.HallOfFameScreen;
-import cz.nic.tablexia.screen.preferences.PreferencesScreen;
-import cz.nic.tablexia.screen.statistics.StatisticsScreen;
-
-public enum ScreenDefinition {
-<<<<<<< HEAD
-
-    GAME_MENU(GameMenuScreen.class, null),
-    HALL_OF_FAME(HallOfFameScreen.class, MainMenuDefinition.HALL_OF_FAME),
-    STATISTICS(StatisticsScreen.class, MainMenuDefinition.STATISTICS),
-    ENCYCLOPEDIA(EncyclopediaScreen.class, MainMenuDefinition.ENCYCLOPEDIA),
-    PREFERENCES(PreferencesScreen.class, MainMenuDefinition.PREFERENCES),
-    ABOUT_APPLICATION(AboutScreen.class, MainMenuDefinition.ABOUT_APPLICATION);
-
-    private        Class<? extends AbstractTablexiaScreen<?>> screenClass;
-    private        MainMenuDefinition                         mainMenuDefinition;
-    private static Object                                     messageHandler;
-
-    private ScreenDefinition(Class<? extends AbstractTablexiaScreen<?>> screenClass, MainMenuDefinition mainMenuDefinition) {
-        this.screenClass = screenClass;
-        this.mainMenuDefinition = mainMenuDefinition;
-    }
-
-    public MainMenuDefinition getMainMenuDefinition() {
-        return mainMenuDefinition;
-    }
-
-    public void performMenuAction() {
-        ApplicationBus.getInstance().publishAsync(new ChangeScreenEvent(screenClass, ScreenTransaction.FADE));
-    }
-
-    public static ScreenDefinition getScreenDefinitionForMainMenuDefinition(MainMenuDefinition mainMenuDefinition) {
-        for (ScreenDefinition screenDefinition : ScreenDefinition.values()) {
-            if (screenDefinition.getMainMenuDefinition() == mainMenuDefinition) {
-                return screenDefinition;
-            }
-        }
-        return null;
-    }
-
-    public static void initBus() {
-        messageHandler = new Object() {
-
-            @Handler
-            public void handleChangeScreenEvent(MainMenuDefinition mainMenuDefinition) {
-                ScreenDefinition.getScreenDefinitionForMainMenuDefinition(mainMenuDefinition).performMenuAction();
-            }
-        };
-        ApplicationBus.getInstance().subscribe(messageHandler);
-    }
-=======
-	
-	GAME_MENU			(GameMenuScreen.class, 		null),
-	HALL_OF_FAME		(HallOfFameScreen.class,	MainMenuDefinition.HALL_OF_FAME),
-	STATISTICS			(StatisticsScreen.class,	MainMenuDefinition.STATISTICS),
-	ENCYCLOPEDIA		(EncyclopediaScreen.class, 	MainMenuDefinition.ENCYCLOPEDIA),
-    PREFERENCES	        (PreferencesScreen.class, 	MainMenuDefinition.PREFERENCES),
-	ABOUT_APPLICATION	(AboutScreen.class, 		MainMenuDefinition.ABOUT_APPLICATION);
-	
-	private Class<? extends AbstractTablexiaScreen<?>> 	screenClass;
-	private MainMenuDefinition 							mainMenuDefinition;
-	private static Object								messageHandler;
-
-	private ScreenDefinition(Class<? extends AbstractTablexiaScreen<?>> screenClass, MainMenuDefinition mainMenuDefinition) {
-		this.screenClass = screenClass;
-		this.mainMenuDefinition = mainMenuDefinition;
-	}
-
-    public Class<? extends AbstractTablexiaScreen<?>> getScreenClass() {
-        return screenClass;
-    }
-
-    public MainMenuDefinition getMainMenuDefinition() {
-		return mainMenuDefinition;
-	}
-
-	public void performMenuAction() {
-		ApplicationBus.getInstance().publishAsync(new ChangeScreenEvent(screenClass, ScreenTransaction.FADE));
-	}
-	
-	public static ScreenDefinition getScreenDefinitionForMainMenuDefinition(MainMenuDefinition mainMenuDefinition) {
-		for (ScreenDefinition screenDefinition : ScreenDefinition.values()) {					
-			if (screenDefinition.getMainMenuDefinition() == mainMenuDefinition) {
-				return screenDefinition;
-			}
-		}
-		return null;
-	}
-	
-	public static void initBus() {
-		messageHandler = new Object() {
-			 
-			@Handler
-			public void handleChangeScreenEvent(MainMenuDefinition mainMenuDefinition) {
-				ScreenDefinition.getScreenDefinitionForMainMenuDefinition(mainMenuDefinition).performMenuAction();
-			}
-		};
-		ApplicationBus.getInstance().subscribe(messageHandler);
-	}
->>>>>>> devel
-}
diff --git a/ios/src/cz/nic/tablexia/IOSLauncher.java.orig b/ios/src/cz/nic/tablexia/IOSLauncher.java.orig
deleted file mode 100644
index d8c6dc520f1b9ea28a3b587bed429c757e01ffd7..0000000000000000000000000000000000000000
--- a/ios/src/cz/nic/tablexia/IOSLauncher.java.orig
+++ /dev/null
@@ -1,36 +0,0 @@
-package cz.nic.tablexia;
-
-import com.badlogic.gdx.backends.iosrobovm.IOSApplication;
-import com.badlogic.gdx.backends.iosrobovm.IOSApplicationConfiguration;
-
-import org.robovm.apple.foundation.NSAutoreleasePool;
-import org.robovm.apple.foundation.NSBundle;
-import org.robovm.apple.foundation.NSDictionary;
-import org.robovm.apple.foundation.NSString;
-import org.robovm.apple.uikit.UIApplication;
-
-import java.util.Locale;
-
-public class IOSLauncher extends IOSApplication.Delegate {
-    @Override
-    protected IOSApplication createApplication() {
-        IOSApplicationConfiguration config = new IOSApplicationConfiguration();
-<<<<<<< HEAD
-
-        NSDictionary infoDictionary = NSBundle.getMainBundle().getInfoDictionary();
-        String buildType = infoDictionary.get(new NSString("cz.nic.tablexia.BuildType")).toString();
-        String versionName = infoDictionary.get(new NSString("CFBundleShortVersionString")).toString();
-        String applicationId = infoDictionary.get(new NSString("CFBundleIdentifier")).toString();
-
-        return new IOSApplication(new Tablexia(buildType, Locale.getDefault(), versionName, applicationId), config);
-=======
-        return new IOSApplication(new Tablexia(null, Locale.getDefault(), null, null, false), config);
->>>>>>> feature-pauseresume
-    }
-
-    public static void main(String[] argv) {
-        NSAutoreleasePool pool = new NSAutoreleasePool();
-        UIApplication.main(argv, null, IOSLauncher.class);
-        pool.close();
-    }
-}
\ No newline at end of file