stadt
Merge branch 'master' into trunk

Conflicts:
	src/Person.java
k
i
Merge branch 'br3' into br2
Merge branch 'br2' into trunk

Conflicts:
	src/Person.java
j
a
l
Merge branch 'trunk'

Conflicts:
	src/Person.java
aa
a
a
rr