Index: /trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/exercisesheet/PdfGenerator.java
===================================================================
--- /trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/exercisesheet/PdfGenerator.java	(revision 16)
+++ /trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/exercisesheet/PdfGenerator.java	(revision 17)
@@ -139,4 +139,8 @@
 			template = template.replaceAll("(\\W)DUEDATE(\\W)", "$1"
 					+ Matcher.quoteReplacement(dueDateString) + "$2");
+			template = template.replaceAll("(\\W)RESEARCHGROUP(\\W)", "$1"
+					+ Matcher.quoteReplacement(settings.getMyResearchGroup()) + "$2");
+			template = template.replaceAll("(\\W)RESEARCHGROUPURL(\\W)", "$1"
+					+ Matcher.quoteReplacement(settings.getMyResearchGroupUrl()) + "$2");
 
 			// write temporary .tex file to temp directory
Index: /trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings/SettingsDialog.java
===================================================================
--- /trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings/SettingsDialog.java	(revision 16)
+++ /trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings/SettingsDialog.java	(revision 17)
@@ -46,4 +46,6 @@
 	private Text textMySQLPassword;
 	private Text textPdflatex;
+	private Text textResearchGroup;
+	private Text textResearchGroupUrl;
 	private Combo cboUseSSL;
 	private String svnLocation = "";
@@ -56,4 +58,6 @@
 	private String mySQLPassword = "";
 	private String myPDFLatexPath = "";
+	private String myResearchGroup = "";
+	private String myResearchGroupUrl = "";
 	private boolean mySQLcheckSSL = false;
 
@@ -203,4 +207,16 @@
 				| GridData.HORIZONTAL_ALIGN_FILL));
 		textPdflatex = textbox10;
+
+		Label label11 = new Label(parent, SWT.NONE);
+		label11.setText("Research Group");
+		textResearchGroup = new Text(parent, SWT.BORDER);
+		textResearchGroup.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL
+				| GridData.HORIZONTAL_ALIGN_FILL));
+
+		Label label12 = new Label(parent, SWT.NONE);
+		label12.setText("Research Group Url");
+		textResearchGroupUrl = new Text(parent, SWT.BORDER);
+		textResearchGroupUrl.setLayoutData(new GridData(
+				GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
 
 		if (mySQLcheckSSL)
@@ -218,4 +234,6 @@
 		textMySQLPassword.setText(mySQLPassword);
 		textPdflatex.setText(myPDFLatexPath);
+		textResearchGroup.setText(myResearchGroup);
+		textResearchGroupUrl.setText(myResearchGroupUrl);
 
 		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
@@ -252,4 +270,6 @@
 					mySQLPassword = textMySQLPassword.getText();
 					myPDFLatexPath = textPdflatex.getText();
+					myResearchGroup = textResearchGroup.getText();
+					myResearchGroupUrl = textResearchGroupUrl.getText();
 
 					if (cboUseSSL.getSelectionIndex() == 1)
@@ -334,4 +354,6 @@
 			mySQLcheckSSL = false;
 			myPDFLatexPath = "";
+			myResearchGroup = "";
+			myResearchGroupUrl = "";
 		} else {
 			try {
@@ -364,4 +386,10 @@
 				if (settings.getProperty("mySQLcheckSSL") != null)
 					myPDFLatexPath = settings.getProperty("myPDFLatexPath");
+				if (settings.getProperty("myResearchGroup") != null)
+					myResearchGroup = settings.getProperty("myResearchGroup");
+				if (settings.getProperty("myResearchGroupUrl") != null)
+					myResearchGroupUrl = settings
+							.getProperty("myResearchGroupUrl");
+
 			} catch (Exception ex) {
 				svnLocation = "";
@@ -375,4 +403,6 @@
 				mySQLcheckSSL = false;
 				myPDFLatexPath = "";
+				myResearchGroup = "";
+				myResearchGroupUrl = "";
 			}
 		}
@@ -402,4 +432,6 @@
 		settings.setProperty("mySQLcheckSSL", String.valueOf(mySQLcheckSSL));
 		settings.setProperty("myPDFLatexPath", myPDFLatexPath);
+		settings.setProperty("myResearchGroup", myResearchGroup);
+		settings.setProperty("myResearchGroupUrl", myResearchGroupUrl);
 
 		try {
@@ -413,3 +445,11 @@
 	}
 
+	public String getMyResearchGroup() {
+		return myResearchGroup;
+	}
+
+	public String getMyResearchGroupUrl() {
+		return myResearchGroupUrl;
+	}
+
 }