udpateing subject modified,

resign is marked as true only when both subjects contain this
information
the same for postponed

appointment-import/src/main/java/smash/appointment/parse/Subject.java

@@ -477,9 +477,9 @@ public class Subject {
 		setAddDate(getMergedValue("addDate", this.getAddDate(), subject.getAddDate(), errorPrefix, true));
 		setmPowerId(getMergedValue("mPowerId", this.getmPowerId(), subject.getmPowerId(), errorPrefix));
 		setType(getMergedValue("type", this.getType(), subject.getType(), errorPrefix));
-		setResigned(this.isResigned() || subject.isResigned());
+		setResigned(this.isResigned() && subject.isResigned());
 		setDead(this.isDead() || subject.isDead());
-		setPostponed(this.isPostponed() || subject.isPostponed());
+		setPostponed(this.isPostponed() && subject.isPostponed());
 		// override only when to be seen by flying team
 		if (subject.getToBeSeenAt() != null && subject.getToBeSeenAt().equals("F")) {
 			setToBeSeenAt(subject.getToBeSeenAt());

appointment-import/src/test/java/smash/appointment/parse/PrcSubjectsParserTest.java

@@ -44,7 +44,7 @@ public class PrcSubjectsParserTest extends TestBase {
 		assertEquals("D-66636", subject.getZipCode());
 		assertEquals("Trier", subject.getCity());
 		assertEquals("Deutschland", subject.getCountry());
-		assertEquals("0049 12 34 556 76", subject.getPhone1());
+		assertEquals("0049123455676", subject.getPhone1());
 		assertEquals("tel2", subject.getPhone2());
 		assertEquals("tel3", subject.getPhone3());
 		assertEquals("piotr.cos@uni.lu", subject.getMail());