contact number
Merge branch 'master' into uebung-1_001
Merge branch 'uebung-1_001' into uebung-1_002

Conflicts:
	uebung-1/src/test/java/de/pentasys/wicket/ui/person/uebung/PersonPageTest.java