Resolve conflicts

src/baleine/common/dataModel/Board.java

+package baleine.common.dataModel;
+import java.util.UUID;
+
+public class Board {
+	UUID game;
+	int[][] state;
+}

src/baleine/common/dataModel/Chat.java

+package baleine.common.dataModel;
+
+import java.util.List;
+
+public class Chat {
+	List<Message> chat;
+	GameMeta game;
+}

src/baleine/common/dataModel/GameHeavy.java

+package baleine.common.dataModel;
+
+import java.security.Timestamp;
+import java.util.List;
+import java.util.UUID;
+
+public class GameHeavy extends GameMeta {
+	List<Move> moveList;
+	Timestamp gameStart;
+	Chat chat;
+	UUID winner;
+	List<UserZero> spectators;
+}

src/baleine/common/dataModel/GameLight.java

+package baleine.common.dataModel;
+
+public class GameLight extends GameMeta {
+
+}

src/baleine/common/dataModel/GameMeta.java

+package baleine.common.dataModel;
+import java.util.UUID;
+
+abstract class GameMeta {
+	protected UUID id;
+	protected UserLight gameCreator;
+	protected UserLight player2;
+	protected GameStatus status;
+	protected boolean isOkSpectators;
+	protected boolean isOkChat;
+	protected boolean isWhiteCreator;
+	protected int limitMove;
+}

src/baleine/common/dataModel/GameStatus.java

+package baleine.common.dataModel;
+
+public enum GameStatus {
+	PENDING,
+	IN_PROGRESS;
+}
+

src/baleine/common/dataModel/Message.java

+package baleine.common.dataModel;
+
+import java.security.Timestamp;
+
+public class Message{
+	Timestamp hourMessage;
+	String message;
+	UserZero author;
+}

src/baleine/common/dataModel/Move.java

+package baleine.common.dataModel;
+
+import java.security.Timestamp;
+
+public class Move {
+	UserZero player;
+	Timestamp hourMove;
+	int X;
+	int Y;
+}

src/baleine/common/dataModel/UserHeavy.java

+package baleine.common.dataModel;
+
+public class UserHeavy extends UserMeta {
+	String password;
+	String serverAddress;
+	String serverPort;
+	List<GameHeavy> savedGames;
+}

src/baleine/common/dataModel/UserLight.java

+package baleine.common.dataModel;
+import java.util.Date;
+
+public class UserLight extends UserMeta {
+	String lastName;
+	String firstName;
+	Date dateOfBirth;
+	int avatarId;
+	int playedGames;
+	int wonGames;
+}

src/baleine/common/dataModel/UserMeta.java

+package baleine.common.dataModel;
+
+import java.util.UUID;
+
+abstract class UserMeta {
+	protected UUID id;
+	protected String pseudo;
+}

src/baleine/common/dataModel/UserZero.java

+package baleine.common.dataModel;
+
+public class UserZero extends UserMeta {
+
+}