Merge branch 'option-ui' into merge

# Conflicts:
#	client/data/src/main/java/res/DataController.java

client/data/src/main/java/res/User.java

@@ -0,0 +1,44 @@
+package res;
+
+public class User {
+
+    private int id;
+    private String loginName;
+    private String forename;
+    private String name;
+
+    public User(){
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
+    public String getForename() {
+        return forename;
+    }
+
+    public void setForename(String forename) {
+        this.forename = forename;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}