merge from Branch 'lp:~christian-k/openpetraorg/dev_0001821_contact_details_3nd_part'

https://tracker.openpetra.org/view.php?id=3529
https://tracker.openpetra.org/view.php?id=3561
https://tracker.openpetra.org/view.php?id=3566
https://tracker.openpetra.org/view.php?id=2749
https://tracker.openpetra.org/view.php?id=3593
https://tracker.openpetra.org/view.php?id=3495
https://tracker.openpetra.org/view.php?id=3596
https://tracker.openpetra.org/view.php?id=3452
https://tracker.openpetra.org/view.php?id=3608
https://tracker.openpetra.org/view.php?id=3609
https://tracker.openpetra.org/view.php?id=3685
https://tracker.openpetra.org/view.php?id=3687
https://tracker.openpetra.org/view.php?id=3701